summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-08-08 19:05:41 +0100
committerGitHub <noreply@github.com>2022-08-08 19:05:41 +0100
commit0002b1cc208a631917c8e2bca1347cac811ef4c7 (patch)
tree0cd63139e95e39ad44374024d2854afdb1a146f2
parenta3b06fd87cddcac17d9a376f4cfee4d01c0b5dcf (diff)
Also disable line ending conversion for merge workflows (#17953)
-rw-r--r--.github/workflows/develop_update.yml4
-rw-r--r--.github/workflows/feature_branch_update.yml4
2 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 928327e7eb..18ca84162b 100644
--- 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
index 80891edb01..90cd85e355 100644
--- 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 }}