Skip to content

Commit 6a795fd

Browse files
hamzaremmalhamzaremmal
authored
Fix nightly build failure + Address issue with the self-hosted runner (#19720)
Closes #19712 This PR introduce a workaround for actions/runner#2033. This workaround was already introduced in #19703 in some of the jobs. `actions/checkout` has an issue filled about this too: actions/checkout#1169
2 parents 9e3ce5e + 9f7bf72 commit 6a795fd

File tree

2 files changed

+47
-15
lines changed

2 files changed

+47
-15
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ jobs:
6868
- name: Set JDK 17 as default
6969
run: echo "/usr/lib/jvm/java-17-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@v4
@@ -120,7 +123,9 @@ jobs:
120123
run: echo "/usr/lib/jvm/java-17-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@v4
@@ -174,7 +179,9 @@ jobs:
174179
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
175180

176181
- name: Reset existing repo
177-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
182+
run: |
183+
git config --global --add safe.directory /__w/dotty/dotty
184+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
178185
179186
- name: Checkout cleanup script
180187
uses: actions/checkout@v4
@@ -211,8 +218,10 @@ jobs:
211218

212219
steps:
213220
- name: Reset existing repo
214-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
215221
shell: cmd
222+
run: |
223+
git config --global --add safe.directory /__w/dotty/dotty
224+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
216225
217226
- name: Git Checkout
218227
uses: actions/checkout@v4
@@ -253,8 +262,10 @@ jobs:
253262

254263
steps:
255264
- name: Reset existing repo
256-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
257265
shell: cmd
266+
run: |
267+
git config --global --add safe.directory /__w/dotty/dotty
268+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
258269
259270
- name: Git Checkout
260271
uses: actions/checkout@v4
@@ -294,7 +305,9 @@ jobs:
294305
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
295306

296307
- name: Reset existing repo
297-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
308+
run: |
309+
git config --global --add safe.directory /__w/dotty/dotty
310+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
298311
299312
- name: Checkout cleanup script
300313
uses: actions/checkout@v4
@@ -344,7 +357,9 @@ jobs:
344357
- name: Set JDK 8 as default
345358
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
346359
- name: Reset existing repo
347-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
360+
run: |
361+
git config --global --add safe.directory /__w/dotty/dotty
362+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
348363
349364
- name: Checkout cleanup script
350365
uses: actions/checkout@v4
@@ -396,7 +411,9 @@ jobs:
396411
- name: Set JDK 8 as default
397412
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
398413
- name: Reset existing repo
399-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
414+
run: |
415+
git config --global --add safe.directory /__w/dotty/dotty
416+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
400417
401418
- name: Checkout cleanup script
402419
uses: actions/checkout@v4
@@ -448,7 +465,9 @@ jobs:
448465
- name: Set JDK 8 as default
449466
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
450467
- name: Reset existing repo
451-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
468+
run: |
469+
git config --global --add safe.directory /__w/dotty/dotty
470+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
452471
453472
- name: Checkout cleanup script
454473
uses: actions/checkout@v4
@@ -499,7 +518,9 @@ jobs:
499518
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
500519

501520
- name: Reset existing repo
502-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
521+
run: |
522+
git config --global --add safe.directory /__w/dotty/dotty
523+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
503524
504525
- name: Checkout cleanup script
505526
uses: actions/checkout@v4
@@ -546,7 +567,9 @@ jobs:
546567
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
547568

548569
- name: Reset existing repo
549-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
570+
run: |
571+
git config --global --add safe.directory /__w/dotty/dotty
572+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
550573
551574
- name: Checkout cleanup script
552575
uses: actions/checkout@v4
@@ -592,7 +615,9 @@ jobs:
592615
- name: Set JDK 17 as default
593616
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
594617
- name: Reset existing repo
595-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
618+
run: |
619+
git config --global --add safe.directory /__w/dotty/dotty
620+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
596621
597622
- name: Checkout cleanup script
598623
uses: actions/checkout@v4
@@ -646,7 +671,9 @@ jobs:
646671

647672
steps:
648673
- name: Reset existing repo
649-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
674+
run: |
675+
git config --global --add safe.directory /__w/dotty/dotty
676+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
650677
651678
- name: Checkout cleanup script
652679
uses: actions/checkout@v4
@@ -662,6 +689,7 @@ jobs:
662689

663690
- name: Generate Website
664691
run: |
692+
git config --global --add safe.directory /__w/dotty/dotty
665693
./project/scripts/genDocs -doc-snapshot
666694
667695
- name: Deploy Website to dotty-website
@@ -696,7 +724,9 @@ jobs:
696724

697725
steps:
698726
- name: Reset existing repo
699-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
727+
run: |
728+
git config --global --add safe.directory /__w/dotty/dotty
729+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
700730
701731
- name: Checkout cleanup script
702732
uses: actions/checkout@v4

‎.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)