Skip to content

Commit 98cd32e

Browse files
committed
Merge branch 'release-3.2.1' into language-reference-stable
2 parents a1eb7b5 + 529ddc5 commit 98cd32e

File tree

2,112 files changed

+45227
-15867
lines changed

Some content is hidden

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

2,112 files changed

+45227
-15867
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

.github/workflows/ci.yaml

Lines changed: 85 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
push:
55
branches-ignore:
66
- 'language-reference-stable'
7+
tags:
8+
- '**'
79
pull_request:
810
branches-ignore:
911
- 'language-reference-stable'
@@ -57,20 +59,25 @@ jobs:
5759
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
5860

5961
- name: Checkout cleanup script
60-
uses: actions/checkout@v2
62+
uses: actions/checkout@v3
6163

6264
- name: Cleanup
6365
run: .github/workflows/cleanup.sh
6466

6567
- name: Git Checkout
66-
uses: actions/checkout@v2
68+
uses: actions/checkout@v3
6769

6870
- name: Add SBT proxy repositories
6971
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
7072

7173
- name: Test
74+
# DON'T add dist/pack!
75+
# Adding dist/pack bootstraps the compiler
76+
# which undermines the point of these tests:
77+
# to quickly run the tests without the cost of bootstrapping
78+
# and also to run tests when the compiler doesn't bootstrap
7279
run: |
73-
./project/scripts/sbt ";dist/pack; compile ;test"
80+
./project/scripts/sbt ";compile ;test"
7481
./project/scripts/cmdTests
7582
7683
test:
@@ -102,23 +109,27 @@ jobs:
102109
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
103110

104111
- name: Checkout cleanup script
105-
uses: actions/checkout@v2
112+
uses: actions/checkout@v3
106113

107114
- name: Cleanup
108115
run: .github/workflows/cleanup.sh
109116

110117
- name: Git Checkout
111-
uses: actions/checkout@v2
118+
uses: actions/checkout@v3
112119

113120
- name: Add SBT proxy repositories
114121
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
115122

116123
- name: Cmd Tests
117124
run: |
118-
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
125+
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
119126
./project/scripts/cmdTests
120127
./project/scripts/bootstrappedOnlyCmdTests
121128
129+
- name: Scala.js Test
130+
run: |
131+
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
132+
122133
test_windows_fast:
123134
runs-on: [self-hosted, Windows]
124135
if: "(
@@ -137,7 +148,7 @@ jobs:
137148
shell: cmd
138149

139150
- name: Git Checkout
140-
uses: actions/checkout@v2
151+
uses: actions/checkout@v3
141152

142153
- name: Test
143154
run: sbt ";scala3-bootstrapped/compile"
@@ -160,7 +171,7 @@ jobs:
160171
shell: cmd
161172

162173
- name: Scala.js Test
163-
run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
174+
run: sbt ";sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
164175
shell: cmd
165176

166177
test_windows_full:
@@ -179,14 +190,14 @@ jobs:
179190
shell: cmd
180191

181192
- name: Git Checkout
182-
uses: actions/checkout@v2
193+
uses: actions/checkout@v3
183194

184195
- name: Test
185196
run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
186197
shell: cmd
187198

188199
- name: Scala.js Test
189-
run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
200+
run: sbt ";sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
190201
shell: cmd
191202

192203
mima:
@@ -215,13 +226,13 @@ jobs:
215226
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
216227

217228
- name: Checkout cleanup script
218-
uses: actions/checkout@v2
229+
uses: actions/checkout@v3
219230

220231
- name: Cleanup
221232
run: .github/workflows/cleanup.sh
222233

223234
- name: Git Checkout
224-
uses: actions/checkout@v2
235+
uses: actions/checkout@v3
225236

226237
- name: Add SBT proxy repositories
227238
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -256,13 +267,13 @@ jobs:
256267
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
257268

258269
- name: Checkout cleanup script
259-
uses: actions/checkout@v2
270+
uses: actions/checkout@v3
260271

261272
- name: Cleanup
262273
run: .github/workflows/cleanup.sh
263274

264275
- name: Git Checkout
265-
uses: actions/checkout@v2
276+
uses: actions/checkout@v3
266277

267278
- name: Add SBT proxy repositories
268279
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -303,13 +314,13 @@ jobs:
303314
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
304315

305316
- name: Checkout cleanup script
306-
uses: actions/checkout@v2
317+
uses: actions/checkout@v3
307318

308319
- name: Cleanup
309320
run: .github/workflows/cleanup.sh
310321

311322
- name: Git Checkout
312-
uses: actions/checkout@v2
323+
uses: actions/checkout@v3
313324

314325
- name: Add SBT proxy repositories
315326
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -350,13 +361,13 @@ jobs:
350361
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
351362

352363
- name: Checkout cleanup script
353-
uses: actions/checkout@v2
364+
uses: actions/checkout@v3
354365

355366
- name: Cleanup
356367
run: .github/workflows/cleanup.sh
357368

358369
- name: Git Checkout
359-
uses: actions/checkout@v2
370+
uses: actions/checkout@v3
360371

361372
- name: Add SBT proxy repositories
362373
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -397,13 +408,13 @@ jobs:
397408
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
398409

399410
- name: Checkout cleanup script
400-
uses: actions/checkout@v2
411+
uses: actions/checkout@v3
401412

402413
- name: Cleanup
403414
run: .github/workflows/cleanup.sh
404415

405416
- name: Git Checkout
406-
uses: actions/checkout@v2
417+
uses: actions/checkout@v3
407418

408419
- name: Add SBT proxy repositories
409420
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -444,23 +455,27 @@ jobs:
444455
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
445456

446457
- name: Checkout cleanup script
447-
uses: actions/checkout@v2
458+
uses: actions/checkout@v3
448459

449460
- name: Cleanup
450461
run: .github/workflows/cleanup.sh
451462

452463
- name: Git Checkout
453-
uses: actions/checkout@v2
464+
uses: actions/checkout@v3
454465

455466
- name: Add SBT proxy repositories
456467
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
457468

458469
- name: Test
459470
run: |
460-
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
471+
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
461472
./project/scripts/cmdTests
462473
./project/scripts/bootstrappedOnlyCmdTests
463474
475+
- name: Scala.js Test
476+
run: |
477+
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
478+
464479
publish_nightly:
465480
runs-on: [self-hosted, Linux]
466481
container:
@@ -484,13 +499,13 @@ jobs:
484499
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
485500

486501
- name: Checkout cleanup script
487-
uses: actions/checkout@v2
502+
uses: actions/checkout@v3
488503

489504
- name: Cleanup
490505
run: .github/workflows/cleanup.sh
491506

492507
- name: Git Checkout
493-
uses: actions/checkout@v2
508+
uses: actions/checkout@v3
494509

495510
- name: Add SBT proxy repositories
496511
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -538,13 +553,13 @@ jobs:
538553
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
539554

540555
- name: Checkout cleanup script
541-
uses: actions/checkout@v2
556+
uses: actions/checkout@v3
542557

543558
- name: Cleanup
544559
run: .github/workflows/cleanup.sh
545560

546561
- name: Git Checkout
547-
uses: actions/checkout@v2
562+
uses: actions/checkout@v3
548563

549564
- name: Add SBT proxy repositories
550565
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -561,8 +576,48 @@ jobs:
561576
external_repository: lampepfl/dotty-website
562577
publish_branch: gh-pages
563578

579+
nightly_unmanaged_community_build:
580+
# Self-hosted runner is used only for getting current build version
581+
runs-on: [self-hosted, Linux]
582+
container:
583+
image: lampepfl/dotty:2021-03-22
584+
options: --cpu-shares 4096
585+
volumes:
586+
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
587+
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
588+
- ${{ github.workspace }}/../../cache/general:/root/.cache
589+
needs: [publish_nightly]
590+
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
591+
env:
592+
NIGHTLYBUILD: yes
593+
steps:
594+
- 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
596+
597+
- name: Checkout cleanup script
598+
uses: actions/checkout@v3
599+
600+
- name: Cleanup
601+
run: .github/workflows/cleanup.sh
602+
603+
- name: Git Checkout
604+
uses: actions/checkout@v3
605+
606+
- name: Add SBT proxy repositories
607+
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
608+
609+
- name: Get version string for this build
610+
run: |
611+
ver=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
612+
echo "This build version: $ver"
613+
echo "THISBUILD_VERSION=$ver" >> $GITHUB_ENV
614+
# Steps above are copy-pasted from publish_nightly, needed only to resolve THISBUILD_VERSION
615+
- name: Trigger unmanaged community build
616+
run: .github/workflows/scripts/triggerUnmanagedCommunityBuild.sh "${{ secrets.BUILD_TOKEN }}" "$THISBUILD_VERSION"
564617

565618
publish_release:
619+
permissions:
620+
contents: write # for actions/create-release to create a release
566621
runs-on: [self-hosted, Linux]
567622
container:
568623
image: lampepfl/dotty:2021-03-22
@@ -587,13 +642,13 @@ jobs:
587642
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
588643

589644
- name: Checkout cleanup script
590-
uses: actions/checkout@v2
645+
uses: actions/checkout@v3
591646

592647
- name: Cleanup
593648
run: .github/workflows/cleanup.sh
594649

595650
- name: Git Checkout
596-
uses: actions/checkout@v2
651+
uses: actions/checkout@v3
597652

598653
- name: Add SBT proxy repositories
599654
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -660,7 +715,7 @@ jobs:
660715
if: "failure() && github.event_name == 'schedule'"
661716
steps:
662717
- name: Checkout issue template
663-
uses: actions/checkout@v2
718+
uses: actions/checkout@v3
664719

665720
- name: Open an issue
666721
uses: JasonEtco/create-an-issue@v2

.github/workflows/cla.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ on:
44
push:
55
branches:
66
- 'language-reference-backport'
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
711
jobs:
812
check:
913
runs-on: ubuntu-latest
1014
steps:
11-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1216
- run: ./project/scripts/check-cla.sh
1317
if: github.event_name == 'pull_request'
1418
env:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Update Dependency Graph
2+
on:
3+
push:
4+
branches:
5+
- main # default branch of the project
6+
jobs:
7+
dependency-graph:
8+
name: Update Dependency Graph
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- uses: scalacenter/sbt-dependency-submission@v2

0 commit comments

Comments
 (0)