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

rys · Aug 8, 2022 · 0002b1c · 0002b1c
1 parent a3b06fd
commit 0002b1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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 }}