Skip to content

Commit 3fac025

Browse files
authored
Merge branch 'main' into optimize-check-init
2 parents e493494 + b1b0372 commit 3fac025

File tree

598 files changed

+9828
-3269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

598 files changed

+9828
-3269
lines changed

.github/workflows/ci.yaml

Lines changed: 72 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
- '*'
1919
branches-ignore:
2020
- 'gh-readonly-queue/**'
21+
- 'release-**'
22+
- 'lts-**'
2123
pull_request:
2224
merge_group:
2325
schedule:
@@ -70,13 +72,13 @@ jobs:
7072
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
7173

7274
- name: Checkout cleanup script
73-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7476

7577
- name: Cleanup
7678
run: .github/workflows/cleanup.sh
7779

7880
- name: Git Checkout
79-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8082

8183
- name: Add SBT proxy repositories
8284
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -121,13 +123,13 @@ jobs:
121123
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
122124

123125
- name: Checkout cleanup script
124-
uses: actions/checkout@v3
126+
uses: actions/checkout@v4
125127

126128
- name: Cleanup
127129
run: .github/workflows/cleanup.sh
128130

129131
- name: Git Checkout
130-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
131133

132134
- name: Add SBT proxy repositories
133135
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -142,6 +144,51 @@ jobs:
142144
run: |
143145
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
144146
147+
- name: Test with Scala 2 library TASTy (fast)
148+
run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation i5; scala3-bootstrapped/testCompilation tests/run/typelevel-peano.scala; scala3-bootstrapped/testOnly dotty.tools.backend.jvm.DottyBytecodeTests" # only test a subset of test to avoid doubling the CI execution time
149+
150+
test_scala2_library_tasty:
151+
runs-on: [self-hosted, Linux]
152+
container:
153+
image: lampepfl/dotty:2021-03-22
154+
options: --cpu-shares 4096
155+
volumes:
156+
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
157+
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
158+
- ${{ github.workspace }}/../../cache/general:/root/.cache
159+
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
160+
|| (
161+
github.event_name == 'pull_request'
162+
&& contains(github.event.pull_request.body, '[test_scala2_library_tasty]')
163+
)
164+
|| (
165+
github.event_name == 'workflow_dispatch'
166+
&& github.repository == 'lampepfl/dotty'
167+
)"
168+
169+
steps:
170+
- name: Set JDK 16 as default
171+
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
172+
173+
- name: Reset existing repo
174+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
175+
176+
- name: Checkout cleanup script
177+
uses: actions/checkout@v3
178+
179+
- name: Cleanup
180+
run: .github/workflows/cleanup.sh
181+
182+
- name: Git Checkout
183+
uses: actions/checkout@v3
184+
185+
- name: Add SBT proxy repositories
186+
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
187+
188+
- name: Test with Scala 2 library TASTy
189+
run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation"
190+
191+
145192
test_windows_fast:
146193
runs-on: [self-hosted, Windows]
147194
if: "(
@@ -161,7 +208,7 @@ jobs:
161208
shell: cmd
162209

163210
- name: Git Checkout
164-
uses: actions/checkout@v3
211+
uses: actions/checkout@v4
165212

166213
- name: Test
167214
run: sbt ";scala3-bootstrapped/compile"
@@ -203,16 +250,12 @@ jobs:
203250
shell: cmd
204251

205252
- name: Git Checkout
206-
uses: actions/checkout@v3
253+
uses: actions/checkout@v4
207254

208255
- name: Test
209256
run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
210257
shell: cmd
211258

212-
- name: Test with Scala 2 library TASTy
213-
run: sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/testCompilation i5" # only test a subset of test to avoid doubling the CI execution time
214-
shell: cmd
215-
216259
- name: Scala.js Test
217260
run: sbt ";sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
218261
shell: cmd
@@ -244,13 +287,13 @@ jobs:
244287
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
245288

246289
- name: Checkout cleanup script
247-
uses: actions/checkout@v3
290+
uses: actions/checkout@v4
248291

249292
- name: Cleanup
250293
run: .github/workflows/cleanup.sh
251294

252295
- name: Git Checkout
253-
uses: actions/checkout@v3
296+
uses: actions/checkout@v4
254297

255298
- name: Add SBT proxy repositories
256299
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -292,13 +335,13 @@ jobs:
292335
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
293336

294337
- name: Checkout cleanup script
295-
uses: actions/checkout@v3
338+
uses: actions/checkout@v4
296339

297340
- name: Cleanup
298341
run: .github/workflows/cleanup.sh
299342

300343
- name: Git Checkout
301-
uses: actions/checkout@v3
344+
uses: actions/checkout@v4
302345

303346
- name: Add SBT proxy repositories
304347
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -341,13 +384,13 @@ jobs:
341384
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
342385

343386
- name: Checkout cleanup script
344-
uses: actions/checkout@v3
387+
uses: actions/checkout@v4
345388

346389
- name: Cleanup
347390
run: .github/workflows/cleanup.sh
348391

349392
- name: Git Checkout
350-
uses: actions/checkout@v3
393+
uses: actions/checkout@v4
351394

352395
- name: Add SBT proxy repositories
353396
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -390,13 +433,13 @@ jobs:
390433
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
391434

392435
- name: Checkout cleanup script
393-
uses: actions/checkout@v3
436+
uses: actions/checkout@v4
394437

395438
- name: Cleanup
396439
run: .github/workflows/cleanup.sh
397440

398441
- name: Git Checkout
399-
uses: actions/checkout@v3
442+
uses: actions/checkout@v4
400443

401444
- name: Add SBT proxy repositories
402445
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -437,13 +480,13 @@ jobs:
437480
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
438481

439482
- name: Checkout cleanup script
440-
uses: actions/checkout@v3
483+
uses: actions/checkout@v4
441484

442485
- name: Cleanup
443486
run: .github/workflows/cleanup.sh
444487

445488
- name: Git Checkout
446-
uses: actions/checkout@v3
489+
uses: actions/checkout@v4
447490

448491
- name: Add SBT proxy repositories
449492
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -484,13 +527,13 @@ jobs:
484527
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
485528

486529
- name: Checkout cleanup script
487-
uses: actions/checkout@v3
530+
uses: actions/checkout@v4
488531

489532
- name: Cleanup
490533
run: .github/workflows/cleanup.sh
491534

492535
- name: Git Checkout
493-
uses: actions/checkout@v3
536+
uses: actions/checkout@v4
494537

495538
- name: Add SBT proxy repositories
496539
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -528,13 +571,13 @@ jobs:
528571
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
529572

530573
- name: Checkout cleanup script
531-
uses: actions/checkout@v3
574+
uses: actions/checkout@v4
532575

533576
- name: Cleanup
534577
run: .github/workflows/cleanup.sh
535578

536579
- name: Git Checkout
537-
uses: actions/checkout@v3
580+
uses: actions/checkout@v4
538581

539582
- name: Add SBT proxy repositories
540583
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -582,13 +625,13 @@ jobs:
582625
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
583626

584627
- name: Checkout cleanup script
585-
uses: actions/checkout@v3
628+
uses: actions/checkout@v4
586629

587630
- name: Cleanup
588631
run: .github/workflows/cleanup.sh
589632

590633
- name: Git Checkout
591-
uses: actions/checkout@v3
634+
uses: actions/checkout@v4
592635

593636
- name: Add SBT proxy repositories
594637
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -632,13 +675,13 @@ jobs:
632675
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
633676

634677
- name: Checkout cleanup script
635-
uses: actions/checkout@v3
678+
uses: actions/checkout@v4
636679

637680
- name: Cleanup
638681
run: .github/workflows/cleanup.sh
639682

640683
- name: Git Checkout
641-
uses: actions/checkout@v3
684+
uses: actions/checkout@v4
642685

643686
- name: Add SBT proxy repositories
644687
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -705,7 +748,7 @@ jobs:
705748
if: "failure() && github.event_name == 'schedule'"
706749
steps:
707750
- name: Checkout issue template
708-
uses: actions/checkout@v3
751+
uses: actions/checkout@v4
709752

710753
- name: Open an issue
711754
uses: JasonEtco/create-an-issue@v2

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
check:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- run: ./project/scripts/check-cla.sh
2020
if: github.event_name == 'pull_request'
2121
env:

.github/workflows/dependency-graph.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ jobs:
88
name: Update Dependency Graph
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- uses: scalacenter/sbt-dependency-submission@v2

.github/workflows/language-reference.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2525

2626
- name: Git Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
path: 'dotty'
3030
fetch-depth: 0
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: Push changes to scala3-reference-docs
4848
if: github.event_name == 'push'
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050
with:
5151
repository: lampepfl/scala3-reference-docs
5252
fetch-depth: 0
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
- uses: repo-sync/pull-request@v2
7979
with:
8080
destination_branch: main

.github/workflows/lts-backport.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
1717
- uses: coursier/cache-action@v6
18-
- uses: VirtusLab/scala-cli-setup@v1.0.5
18+
- uses: VirtusLab/scala-cli-setup@v1.0.6
1919
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2020
env:
2121
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: .github/workflows/cleanup.sh
2525

2626
- name: Git Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Publish to SDKMAN
3030
run: .github/workflows/scripts/publish-sdkman.sh

.github/workflows/scaladoc.yaml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Git Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131

3232
- name: Set up JDK 17
3333
uses: actions/setup-java@v3
@@ -62,21 +62,6 @@ jobs:
6262
- name: Generate documentation for example project using dotty-sbt
6363
run: ./project/scripts/sbt "sbt-test/scripted sbt-dotty/scaladoc"
6464

65-
- name: Generate index file
66-
run: scaladoc/scripts/mk-index.sh scaladoc/output > scaladoc/output/index.html
67-
68-
- name: Upload documentation to server
69-
uses: azure/CLI@v1
70-
if: env.AZURE_STORAGE_SAS_TOKEN
71-
env:
72-
PR_NUMBER: ${{ github.event.pull_request.number }}
73-
with:
74-
inlineScript: |
75-
DOC_DEST=$(echo pr-${PR_NUMBER:-${GITHUB_REF##*/}} | tr -d -c "[-A-Za-z0-9]")
76-
echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST
77-
az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container
78-
az storage blob upload-batch --overwrite true -s scaladoc/output -d $DOC_DEST --account-name scala3docstorage
79-
8065
stdlib-sourcelinks-test:
8166
runs-on: ubuntu-latest
8267
# if false - disable flaky test
@@ -90,7 +75,7 @@ jobs:
9075

9176
steps:
9277
- name: Git Checkout
93-
uses: actions/checkout@v3
78+
uses: actions/checkout@v4
9479

9580
- name: Set up JDK 17
9681
uses: actions/setup-java@v3

.github/workflows/spec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
working-directory: ./docs/_spec
2222

2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
# Keep in sync with ./docs/_spec/Dockerfile
2727
- uses: ruby/setup-ruby@v1
Submodule munit updated 1 file

0 commit comments

Comments
 (0)