Skip to content

Commit 3fbac6a

Browse files
hamzaremmalKordyjan
authored andcommitted
1 parent 5f3687e commit 3fbac6a

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ jobs:
6868
- name: Set JDK 16 as default
6969
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
7070

71+
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/lampepfl/dotty/pull/19720)
7172
- name: Reset existing repo
72-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
73+
run: |
74+
git config --global --add safe.directory /__w/dotty/dotty
75+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
7376
7477
- name: Checkout cleanup script
7578
uses: actions/checkout@v3
@@ -120,7 +123,9 @@ jobs:
120123
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
121124

122125
- name: Reset existing repo
123-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
126+
run: |
127+
git config --global --add safe.directory /__w/dotty/dotty
128+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
124129
125130
- name: Checkout cleanup script
126131
uses: actions/checkout@v3
@@ -144,6 +149,7 @@ jobs:
144149
run: |
145150
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
146151
152+
147153
test_windows_fast:
148154
runs-on: [self-hosted, Windows]
149155
if: "(
@@ -159,8 +165,10 @@ jobs:
159165

160166
steps:
161167
- name: Reset existing repo
162-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
163168
shell: cmd
169+
run: |
170+
git config --global --add safe.directory /__w/dotty/dotty
171+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
164172
165173
- name: Git Checkout
166174
uses: actions/checkout@v3
@@ -201,8 +209,10 @@ jobs:
201209

202210
steps:
203211
- name: Reset existing repo
204-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
205212
shell: cmd
213+
run: |
214+
git config --global --add safe.directory /__w/dotty/dotty
215+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
206216
207217
- name: Git Checkout
208218
uses: actions/checkout@v3
@@ -239,7 +249,9 @@ jobs:
239249
)"
240250
steps:
241251
- name: Reset existing repo
242-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
252+
run: |
253+
git config --global --add safe.directory /__w/dotty/dotty
254+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
243255
244256
- name: Checkout cleanup script
245257
uses: actions/checkout@v3
@@ -282,7 +294,9 @@ jobs:
282294

283295
steps:
284296
- name: Reset existing repo
285-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
297+
run: |
298+
git config --global --add safe.directory /__w/dotty/dotty
299+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
286300
287301
- name: Checkout cleanup script
288302
uses: actions/checkout@v3
@@ -331,7 +345,9 @@ jobs:
331345

332346
steps:
333347
- name: Reset existing repo
334-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
348+
run: |
349+
git config --global --add safe.directory /__w/dotty/dotty
350+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
335351
336352
- name: Checkout cleanup script
337353
uses: actions/checkout@v3
@@ -380,7 +396,9 @@ jobs:
380396

381397
steps:
382398
- name: Reset existing repo
383-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
399+
run: |
400+
git config --global --add safe.directory /__w/dotty/dotty
401+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
384402
385403
- name: Checkout cleanup script
386404
uses: actions/checkout@v3
@@ -427,7 +445,9 @@ jobs:
427445

428446
steps:
429447
- name: Reset existing repo
430-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
448+
run: |
449+
git config --global --add safe.directory /__w/dotty/dotty
450+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
431451
432452
- name: Checkout cleanup script
433453
uses: actions/checkout@v3
@@ -474,7 +494,9 @@ jobs:
474494
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
475495

476496
- name: Reset existing repo
477-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
497+
run: |
498+
git config --global --add safe.directory /__w/dotty/dotty
499+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
478500
479501
- name: Checkout cleanup script
480502
uses: actions/checkout@v3
@@ -518,7 +540,9 @@ jobs:
518540

519541
steps:
520542
- name: Reset existing repo
521-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
543+
run: |
544+
git config --global --add safe.directory /__w/dotty/dotty
545+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
522546
523547
- name: Checkout cleanup script
524548
uses: actions/checkout@v3
@@ -572,7 +596,9 @@ jobs:
572596

573597
steps:
574598
- name: Reset existing repo
575-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
599+
run: |
600+
git config --global --add safe.directory /__w/dotty/dotty
601+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
576602
577603
- name: Checkout cleanup script
578604
uses: actions/checkout@v3
@@ -623,7 +649,9 @@ jobs:
623649

624650
steps:
625651
- name: Reset existing repo
626-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
652+
run: |
653+
git config --global --add safe.directory /__w/dotty/dotty
654+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
627655
628656
- name: Checkout cleanup script
629657
uses: actions/checkout@v3

.github/workflows/releases.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818

1919
steps:
2020
- name: Reset existing repo
21-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
21+
run: |
22+
git config --global --add safe.directory /__w/dotty/dotty
23+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
2224
2325
- name: Cleanup
2426
run: .github/workflows/cleanup.sh

0 commit comments

Comments
 (0)