Skip to content

Commit 10f2dd8

Browse files
authored
Merge pull request #22026 from bobsira/fix/ci-windows-newline-diff
Normalize line endings to LF according to .gitattributes
2 parents 548c5d4 + a44f67c commit 10f2dd8

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Prevent Git from altering line endings for test fixtures; enforce LF for YAML/JSON under any testdata directory.
2+
**/testdata/**/*.yaml text eol=lf
3+
**/testdata/**/*.yml text eol=lf
4+
**/testdata/**/*.json text eol=lf

.github/workflows/unit-test.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,27 @@ on:
55
branches: [ master ]
66
paths:
77
- .github/workflows/unit-test.yml
8+
- .gitattributes
89
- go.mod
9-
- '**/*.go'
1010
- Makefile
11+
- '**/*.go'
12+
- '**/testdata/**/*.yaml'
13+
- '**/testdata/**/*.yml'
14+
- '**/testdata/**/*.json'
1115
- '!hack/**'
1216
- '!site/**'
1317
- '!**/*.md'
1418
- '!**/*.json'
1519
pull_request:
1620
paths:
1721
- .github/workflows/unit-test.yml
22+
- .gitattributes
1823
- go.mod
19-
- '**/*.go'
2024
- Makefile
25+
- '**/*.go'
26+
- '**/testdata/**/*.yaml'
27+
- '**/testdata/**/*.yml'
28+
- '**/testdata/**/*.json'
2129
- '!hack/**'
2230
- '!site/**'
2331
- '!**/*.md'

0 commit comments

Comments
 (0)