Browse Source

Also disable line ending conversion for merge workflows (#17953)

pull/17964/head
Joel Challis 1 year ago
committed by GitHub
parent
commit
0002b1cc20
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
  1. +4
    -0
      .github/workflows/develop_update.yml
  2. +4
    -0
      .github/workflows/feature_branch_update.yml

+ 4
- 0
.github/workflows/develop_update.yml View File

@ -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


+ 4
- 0
.github/workflows/feature_branch_update.yml View File

@ -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 }}


Loading…
Cancel
Save