mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-22 19:39:27 +00:00
Also disable line ending conversion for merge workflows (#17953)
This commit is contained in:
parent
a3b06fd87c
commit
0002b1cc20
4
.github/workflows/develop_update.yml
vendored
4
.github/workflows/develop_update.yml
vendored
@ -17,6 +17,10 @@ jobs:
|
|||||||
token: ${{ secrets.QMK_BOT_TOKEN }}
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Disable automatic eol conversion
|
||||||
|
run: |
|
||||||
|
echo "* -text" > .git/info/attributes
|
||||||
|
|
||||||
- name: Checkout develop
|
- name: Checkout develop
|
||||||
run: |
|
run: |
|
||||||
git fetch origin master develop
|
git fetch origin master develop
|
||||||
|
4
.github/workflows/feature_branch_update.yml
vendored
4
.github/workflows/feature_branch_update.yml
vendored
@ -22,6 +22,10 @@ jobs:
|
|||||||
token: ${{ secrets.QMK_BOT_TOKEN }}
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Disable automatic eol conversion
|
||||||
|
run: |
|
||||||
|
echo "* -text" > .git/info/attributes
|
||||||
|
|
||||||
- name: Checkout branch
|
- name: Checkout branch
|
||||||
run: |
|
run: |
|
||||||
git fetch origin develop ${{ matrix.branch }}
|
git fetch origin develop ${{ matrix.branch }}
|
||||||
|
Loading…
Reference in New Issue
Block a user