Commit 6b6f45c
authored
Fix transport version tests on windows (elastic#134739) (elastic#134938)
Running on windows has some slightly different behavior when interacting
with the filesystem. In particular, this commit fixes the changed
resources prefix when looking at changed resources in git to always use
forward slashes as git outputs them. It also fixes the case that CI uses
a non-main (eg master) branch as the default branch. Finally it fixes
git diff so it outputs paths relative to the transport resources dir, as
ls-files does.1 parent c156191 commit 6b6f45c
File tree
2 files changed
+8
-3
lines changed- build-tools-internal/src
- integTest/groovy/org/elasticsearch/gradle/internal/transport
- main/java/org/elasticsearch/gradle/internal/transport
2 files changed
+8
-3
lines changedLines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
158 | | - | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
159 | 163 | | |
160 | 164 | | |
161 | 165 | | |
| |||
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
| 126 | + | |
126 | 127 | | |
127 | 128 | | |
128 | 129 | | |
| |||
304 | 305 | | |
305 | 306 | | |
306 | 307 | | |
307 | | - | |
| 308 | + | |
308 | 309 | | |
309 | 310 | | |
310 | 311 | | |
| |||
0 commit comments