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

2022-08-08 19:05:41 +01:00 · 2022-08-08 19:05:41 +01:00 · 0002b1cc20
parent a3b06fd87c
commit 0002b1cc20
2 changed files with 8 additions and 0 deletions
--- 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
--- 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 }}