diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-08 18:06:29 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-08 18:06:29 +0000 |
| commit | 1d33baac8fbd4d4933aaacf810a81d116bb78923 (patch) | |
| tree | 2d187cb115b939b5932960bd0152f420e2c16c37 /.github/workflows | |
| parent | a14cd0fba5c938463e9eab101cad8d3a27c58b14 (diff) | |
| parent | 0002b1cc208a631917c8e2bca1347cac811ef4c7 (diff) | |
| download | qmk_firmware-1d33baac8fbd4d4933aaacf810a81d116bb78923.tar.gz qmk_firmware-1d33baac8fbd4d4933aaacf810a81d116bb78923.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/develop_update.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/feature_branch_update.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml index 928327e7eb..18ca84162b 100644 --- a/.github/workflows/develop_update.yml +++ b/.github/workflows/develop_update.yml @@ -17,6 +17,10 @@ jobs: token: ${{ secrets.QMK_BOT_TOKEN }} fetch-depth: 0 + - name: Disable automatic eol conversion + run: | + echo "* -text" > .git/info/attributes + - name: Checkout develop run: | git fetch origin master develop diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml index 80891edb01..90cd85e355 100644 --- a/.github/workflows/feature_branch_update.yml +++ b/.github/workflows/feature_branch_update.yml @@ -22,6 +22,10 @@ jobs: token: ${{ secrets.QMK_BOT_TOKEN }} fetch-depth: 0 + - name: Disable automatic eol conversion + run: | + echo "* -text" > .git/info/attributes + - name: Checkout branch run: | git fetch origin develop ${{ matrix.branch }} |