Skip to content

Commit a086db7

Browse files
hamzaremmalKordyjan
hamzaremmal
authored and
Kordyjan
committed
Adapt for scala/scala3
1 parent 9f8f150 commit a086db7

File tree

3 files changed

+65
-62
lines changed

3 files changed

+65
-62
lines changed

Diff for: ‎.github/workflows/ci.yaml

+54-51
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@v4
@@ -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@v4
@@ -164,14 +164,14 @@ jobs:
164164
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
165165
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
166166
- ${{ github.workspace }}/../../cache/general:/root/.cache
167-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
167+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
168168
|| (
169169
github.event_name == 'pull_request'
170170
&& contains(github.event.pull_request.body, '[test_scala2_library_tasty]')
171171
)
172172
|| (
173173
github.event_name == 'workflow_dispatch'
174-
&& github.repository == 'lampepfl/dotty'
174+
&& github.repository == 'scala/scala3'
175175
)"
176176

177177
steps:
@@ -180,8 +180,8 @@ jobs:
180180

181181
- name: Reset existing repo
182182
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
183+
git config --global --add safe.directory /__w/scala3/scala3
184+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
185185
186186
- name: Checkout cleanup script
187187
uses: actions/checkout@v4
@@ -220,8 +220,8 @@ jobs:
220220
- name: Reset existing repo
221221
shell: cmd
222222
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
223+
git config --global --add safe.directory /__w/scala3/scala3
224+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
225225
226226
- name: Git Checkout
227227
uses: actions/checkout@v4
@@ -252,7 +252,7 @@ jobs:
252252

253253
test_windows_full:
254254
runs-on: [self-hosted, Windows]
255-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
255+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
256256
|| github.event_name == 'push'
257257
|| (
258258
github.event_name == 'pull_request'
@@ -264,8 +264,8 @@ jobs:
264264
- name: Reset existing repo
265265
shell: cmd
266266
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
267+
git config --global --add safe.directory /__w/scala3/scala3
268+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
269269
270270
- name: Git Checkout
271271
uses: actions/checkout@v4
@@ -288,7 +288,7 @@ jobs:
288288
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
289289
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
290290
- ${{ github.workspace }}/../../cache/general:/root/.cache
291-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
291+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
292292
|| github.event_name == 'push'
293293
|| github.event_name == 'merge_group'
294294
|| (
@@ -298,13 +298,13 @@ jobs:
298298
)
299299
|| (
300300
github.event_name == 'workflow_dispatch'
301-
&& github.repository == 'lampepfl/dotty'
301+
&& github.repository == 'scala/scala3'
302302
)"
303303
steps:
304304
- name: Reset existing repo
305305
run: |
306-
git config --global --add safe.directory /__w/dotty/dotty
307-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
306+
git config --global --add safe.directory /__w/scala3/scala3
307+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
308308
309309
- name: Checkout cleanup script
310310
uses: actions/checkout@v4
@@ -336,7 +336,7 @@ jobs:
336336
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
337337
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
338338
- ${{ github.workspace }}/../../cache/general:/root/.cache
339-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
339+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
340340
|| github.event_name == 'push'
341341
|| github.event_name == 'merge_group'
342342
|| (
@@ -347,14 +347,14 @@ jobs:
347347
)
348348
|| (
349349
github.event_name == 'workflow_dispatch'
350-
&& github.repository == 'lampepfl/dotty'
350+
&& github.repository == 'scala/scala3'
351351
)"
352352

353353
steps:
354354
- name: Reset existing repo
355355
run: |
356-
git config --global --add safe.directory /__w/dotty/dotty
357-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
356+
git config --global --add safe.directory /__w/scala3/scala3
357+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
358358
359359
- name: Checkout cleanup script
360360
uses: actions/checkout@v4
@@ -370,6 +370,7 @@ jobs:
370370

371371
- name: Test
372372
run: |
373+
git config --global --add safe.directory /__w/scala3/scala3
373374
git submodule sync
374375
git submodule update --init --recursive --jobs 7
375376
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -387,7 +388,7 @@ jobs:
387388
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
388389
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
389390
- ${{ github.workspace }}/../../cache/general:/root/.cache
390-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
391+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
391392
|| github.event_name == 'push'
392393
|| github.event_name == 'merge_group'
393394
|| (
@@ -398,14 +399,14 @@ jobs:
398399
)
399400
|| (
400401
github.event_name == 'workflow_dispatch'
401-
&& github.repository == 'lampepfl/dotty'
402+
&& github.repository == 'scala/scala3'
402403
)"
403404

404405
steps:
405406
- name: Reset existing repo
406407
run: |
407-
git config --global --add safe.directory /__w/dotty/dotty
408-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
408+
git config --global --add safe.directory /__w/scala3/scala3
409+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
409410
410411
- name: Checkout cleanup script
411412
uses: actions/checkout@v4
@@ -421,6 +422,7 @@ jobs:
421422

422423
- name: Test
423424
run: |
425+
git config --global --add safe.directory /__w/scala3/scala3
424426
git submodule sync
425427
git submodule update --init --recursive --jobs 7
426428
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -438,7 +440,7 @@ jobs:
438440
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
439441
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
440442
- ${{ github.workspace }}/../../cache/general:/root/.cache
441-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
443+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
442444
|| github.event_name == 'push'
443445
|| github.event_name == 'merge_group'
444446
|| (
@@ -449,14 +451,14 @@ jobs:
449451
)
450452
|| (
451453
github.event_name == 'workflow_dispatch'
452-
&& github.repository == 'lampepfl/dotty'
454+
&& github.repository == 'scala/scala3'
453455
)"
454456

455457
steps:
456458
- name: Reset existing repo
457459
run: |
458-
git config --global --add safe.directory /__w/dotty/dotty
459-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
460+
git config --global --add safe.directory /__w/scala3/scala3
461+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
460462
461463
- name: Checkout cleanup script
462464
uses: actions/checkout@v4
@@ -472,6 +474,7 @@ jobs:
472474

473475
- name: Test
474476
run: |
477+
git config --global --add safe.directory /__w/scala3/scala3
475478
git submodule sync
476479
git submodule update --init --recursive --jobs 7
477480
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -489,7 +492,7 @@ jobs:
489492
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
490493
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
491494
- ${{ github.workspace }}/../../cache/general:/root/.cache
492-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
495+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
493496
|| github.event_name == 'push'
494497
|| (
495498
github.event_name == 'pull_request'
@@ -498,14 +501,14 @@ jobs:
498501
)
499502
|| (
500503
github.event_name == 'workflow_dispatch'
501-
&& github.repository == 'lampepfl/dotty'
504+
&& github.repository == 'scala/scala3'
502505
)"
503506

504507
steps:
505508
- name: Reset existing repo
506509
run: |
507-
git config --global --add safe.directory /__w/dotty/dotty
508-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
510+
git config --global --add safe.directory /__w/scala3/scala3
511+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
509512
510513
- name: Checkout cleanup script
511514
uses: actions/checkout@v4
@@ -532,7 +535,7 @@ jobs:
532535
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
533536
- ${{ github.workspace }}/../../cache/general:/root/.cache
534537

535-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
538+
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
536539
|| (
537540
github.event_name == 'push'
538541
&& startsWith(github.event.ref, 'refs/tags/')
@@ -544,7 +547,7 @@ jobs:
544547
)
545548
|| (
546549
github.event_name == 'workflow_dispatch'
547-
&& github.repository == 'lampepfl/dotty'
550+
&& github.repository == 'scala/scala3'
548551
)"
549552

550553
steps:
@@ -553,8 +556,8 @@ jobs:
553556

554557
- name: Reset existing repo
555558
run: |
556-
git config --global --add safe.directory /__w/dotty/dotty
557-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
559+
git config --global --add safe.directory /__w/scala3/scala3
560+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
558561
559562
- name: Checkout cleanup script
560563
uses: actions/checkout@v4
@@ -588,7 +591,7 @@ jobs:
588591
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
589592
- ${{ github.workspace }}/../../cache/general:/root/.cache
590593
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
591-
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
594+
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
592595
env:
593596
NIGHTLYBUILD: yes
594597
PGP_PW: ${{ secrets.PGP_PW }} # PGP passphrase
@@ -599,8 +602,8 @@ jobs:
599602
steps:
600603
- name: Reset existing repo
601604
run: |
602-
git config --global --add safe.directory /__w/dotty/dotty
603-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
605+
git config --global --add safe.directory /__w/scala3/scala3
606+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
604607
605608
- name: Checkout cleanup script
606609
uses: actions/checkout@v4
@@ -641,7 +644,7 @@ jobs:
641644
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
642645
- ${{ github.workspace }}/../../cache/general:/root/.cache
643646
needs: [publish_nightly]
644-
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
647+
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
645648
env:
646649
NIGHTLYBUILD: yes
647650
DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
@@ -655,8 +658,8 @@ jobs:
655658
steps:
656659
- name: Reset existing repo
657660
run: |
658-
git config --global --add safe.directory /__w/dotty/dotty
659-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
661+
git config --global --add safe.directory /__w/scala3/scala3
662+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
660663
661664
- name: Checkout cleanup script
662665
uses: actions/checkout@v4
@@ -672,7 +675,7 @@ jobs:
672675

673676
- name: Generate Website
674677
run: |
675-
git config --global --add safe.directory /__w/dotty/dotty
678+
git config --global --add safe.directory /__w/scala3/scala3
676679
./project/scripts/genDocs -doc-snapshot
677680
678681
- name: Deploy Website to dotty-website
@@ -708,8 +711,8 @@ jobs:
708711
steps:
709712
- name: Reset existing repo
710713
run: |
711-
git config --global --add safe.directory /__w/dotty/dotty
712-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
714+
git config --global --add safe.directory /__w/scala3/scala3
715+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
713716
714717
- name: Checkout cleanup script
715718
uses: actions/checkout@v4

0 commit comments

Comments
 (0)