Skip to content

Commit 3d12aaa

Browse files
hamzaremmalKordyjan
hamzaremmal
authored and
Kordyjan
committed
Adapt for scala/scala3
1 parent 3fbac6a commit 3d12aaa

File tree

3 files changed

+61
-58
lines changed

3 files changed

+61
-58
lines changed

‎.github/workflows/ci.yaml

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
5454
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
5555
- ${{ github.workspace }}/../../cache/general:/root/.cache
56-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
56+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
5757
|| github.event_name == 'push'
5858
|| (
5959
github.event_name == 'pull_request'
@@ -62,17 +62,17 @@ jobs:
6262
)
6363
|| (
6464
github.event_name == 'workflow_dispatch'
65-
&& github.repository == 'lampepfl/dotty'
65+
&& github.repository == 'scala/scala3'
6666
)"
6767
steps:
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)
71+
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
7272
- name: Reset existing repo
7373
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
74+
git config --global --add safe.directory /__w/scala3/scala3
75+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
7676
7777
- name: Checkout cleanup script
7878
uses: actions/checkout@v3
@@ -105,7 +105,7 @@ jobs:
105105
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
106106
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
107107
- ${{ github.workspace }}/../../cache/general:/root/.cache
108-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
108+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
109109
|| github.event_name == 'push'
110110
|| github.event_name == 'merge_group'
111111
|| (
@@ -115,7 +115,7 @@ jobs:
115115
)
116116
|| (
117117
github.event_name == 'workflow_dispatch'
118-
&& github.repository == 'lampepfl/dotty'
118+
&& github.repository == 'scala/scala3'
119119
)"
120120

121121
steps:
@@ -124,8 +124,8 @@ jobs:
124124

125125
- name: Reset existing repo
126126
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
127+
git config --global --add safe.directory /__w/scala3/scala3
128+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
129129
130130
- name: Checkout cleanup script
131131
uses: actions/checkout@v3
@@ -167,8 +167,8 @@ jobs:
167167
- name: Reset existing repo
168168
shell: cmd
169169
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
170+
git config --global --add safe.directory /__w/scala3/scala3
171+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
172172
173173
- name: Git Checkout
174174
uses: actions/checkout@v3
@@ -199,7 +199,7 @@ jobs:
199199

200200
test_windows_full:
201201
runs-on: [self-hosted, Windows]
202-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
202+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
203203
|| github.event_name == 'push'
204204
|| (
205205
github.event_name == 'pull_request'
@@ -211,8 +211,8 @@ jobs:
211211
- name: Reset existing repo
212212
shell: cmd
213213
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
214+
git config --global --add safe.directory /__w/scala3/scala3
215+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
216216
217217
- name: Git Checkout
218218
uses: actions/checkout@v3
@@ -235,7 +235,7 @@ jobs:
235235
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
236236
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
237237
- ${{ github.workspace }}/../../cache/general:/root/.cache
238-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
238+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
239239
|| github.event_name == 'push'
240240
|| github.event_name == 'merge_group'
241241
|| (
@@ -245,13 +245,13 @@ jobs:
245245
)
246246
|| (
247247
github.event_name == 'workflow_dispatch'
248-
&& github.repository == 'lampepfl/dotty'
248+
&& github.repository == 'scala/scala3'
249249
)"
250250
steps:
251251
- name: Reset existing repo
252252
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
253+
git config --global --add safe.directory /__w/scala3/scala3
254+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
255255
256256
- name: Checkout cleanup script
257257
uses: actions/checkout@v3
@@ -278,7 +278,7 @@ jobs:
278278
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
279279
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
280280
- ${{ github.workspace }}/../../cache/general:/root/.cache
281-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
281+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
282282
|| github.event_name == 'push'
283283
|| github.event_name == 'merge_group'
284284
|| (
@@ -289,14 +289,14 @@ jobs:
289289
)
290290
|| (
291291
github.event_name == 'workflow_dispatch'
292-
&& github.repository == 'lampepfl/dotty'
292+
&& github.repository == 'scala/scala3'
293293
)"
294294

295295
steps:
296296
- name: Reset existing repo
297297
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
298+
git config --global --add safe.directory /__w/scala3/scala3
299+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
300300
301301
- name: Checkout cleanup script
302302
uses: actions/checkout@v3
@@ -312,6 +312,7 @@ jobs:
312312

313313
- name: Test
314314
run: |
315+
git config --global --add safe.directory /__w/scala3/scala3
315316
git submodule sync
316317
git submodule update --init --recursive --jobs 7
317318
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -329,7 +330,7 @@ jobs:
329330
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
330331
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
331332
- ${{ github.workspace }}/../../cache/general:/root/.cache
332-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
333+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
333334
|| github.event_name == 'push'
334335
|| github.event_name == 'merge_group'
335336
|| (
@@ -340,14 +341,14 @@ jobs:
340341
)
341342
|| (
342343
github.event_name == 'workflow_dispatch'
343-
&& github.repository == 'lampepfl/dotty'
344+
&& github.repository == 'scala/scala3'
344345
)"
345346

346347
steps:
347348
- name: Reset existing repo
348349
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
350+
git config --global --add safe.directory /__w/scala3/scala3
351+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
351352
352353
- name: Checkout cleanup script
353354
uses: actions/checkout@v3
@@ -363,6 +364,7 @@ jobs:
363364

364365
- name: Test
365366
run: |
367+
git config --global --add safe.directory /__w/scala3/scala3
366368
git submodule sync
367369
git submodule update --init --recursive --jobs 7
368370
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -380,7 +382,7 @@ jobs:
380382
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
381383
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
382384
- ${{ github.workspace }}/../../cache/general:/root/.cache
383-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
385+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
384386
|| github.event_name == 'push'
385387
|| github.event_name == 'merge_group'
386388
|| (
@@ -391,14 +393,14 @@ jobs:
391393
)
392394
|| (
393395
github.event_name == 'workflow_dispatch'
394-
&& github.repository == 'lampepfl/dotty'
396+
&& github.repository == 'scala/scala3'
395397
)"
396398

397399
steps:
398400
- name: Reset existing repo
399401
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
402+
git config --global --add safe.directory /__w/scala3/scala3
403+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
402404
403405
- name: Checkout cleanup script
404406
uses: actions/checkout@v3
@@ -414,6 +416,7 @@ jobs:
414416

415417
- name: Test
416418
run: |
419+
git config --global --add safe.directory /__w/scala3/scala3
417420
git submodule sync
418421
git submodule update --init --recursive --jobs 7
419422
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -431,7 +434,7 @@ jobs:
431434
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
432435
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
433436
- ${{ github.workspace }}/../../cache/general:/root/.cache
434-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
437+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
435438
|| github.event_name == 'push'
436439
|| (
437440
github.event_name == 'pull_request'
@@ -440,14 +443,14 @@ jobs:
440443
)
441444
|| (
442445
github.event_name == 'workflow_dispatch'
443-
&& github.repository == 'lampepfl/dotty'
446+
&& github.repository == 'scala/scala3'
444447
)"
445448

446449
steps:
447450
- name: Reset existing repo
448451
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
452+
git config --global --add safe.directory /__w/scala3/scala3
453+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
451454
452455
- name: Checkout cleanup script
453456
uses: actions/checkout@v3
@@ -474,7 +477,7 @@ jobs:
474477
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
475478
- ${{ github.workspace }}/../../cache/general:/root/.cache
476479

477-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
480+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
478481
|| (
479482
github.event_name == 'push'
480483
&& startsWith(github.event.ref, 'refs/tags/')
@@ -486,7 +489,7 @@ jobs:
486489
)
487490
|| (
488491
github.event_name == 'workflow_dispatch'
489-
&& github.repository == 'lampepfl/dotty'
492+
&& github.repository == 'scala/scala3'
490493
)"
491494

492495
steps:
@@ -495,8 +498,8 @@ jobs:
495498

496499
- name: Reset existing repo
497500
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
501+
git config --global --add safe.directory /__w/scala3/scala3
502+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
500503
501504
- name: Checkout cleanup script
502505
uses: actions/checkout@v3
@@ -530,7 +533,7 @@ jobs:
530533
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
531534
- ${{ github.workspace }}/../../cache/general:/root/.cache
532535
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
533-
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
536+
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
534537
env:
535538
NIGHTLYBUILD: yes
536539
PGP_PW: ${{ secrets.PGP_PW }} # PGP passphrase
@@ -541,8 +544,8 @@ jobs:
541544
steps:
542545
- name: Reset existing repo
543546
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
547+
git config --global --add safe.directory /__w/scala3/scala3
548+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
546549
547550
- name: Checkout cleanup script
548551
uses: actions/checkout@v3
@@ -583,7 +586,7 @@ jobs:
583586
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
584587
- ${{ github.workspace }}/../../cache/general:/root/.cache
585588
needs: [publish_nightly]
586-
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
589+
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
587590
env:
588591
NIGHTLYBUILD: yes
589592
DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
@@ -597,8 +600,8 @@ jobs:
597600
steps:
598601
- name: Reset existing repo
599602
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
603+
git config --global --add safe.directory /__w/scala3/scala3
604+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
602605
603606
- name: Checkout cleanup script
604607
uses: actions/checkout@v3
@@ -614,7 +617,7 @@ jobs:
614617

615618
- name: Generate Website
616619
run: |
617-
git config --global --add safe.directory /__w/dotty/dotty
620+
git config --global --add safe.directory /__w/scala3/scala3
618621
./project/scripts/genDocs -doc-snapshot
619622
620623
- name: Deploy Website to dotty-website
@@ -650,8 +653,8 @@ jobs:
650653
steps:
651654
- name: Reset existing repo
652655
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
656+
git config --global --add safe.directory /__w/scala3/scala3
657+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
655658
656659
- name: Checkout cleanup script
657660
uses: actions/checkout@v3

0 commit comments

Comments
 (0)