Merge remote-tracking branch 'origin/master' into develop

2022-08-08 18:06:29 +00:00 · 2022-08-08 18:06:29 +00:00 · 1d33baac8f
commit 1d33baac8f
parent a14cd0fba5 0002b1cc20
5 changed files with 176 additions and 168 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 }}