Skip to content

Commit 9573942

Browse files
committed
Merge branch 'master' of github.com:lampepfl/dotty into dotty-scopt
2 parents bbd194e + 73bfead commit 9573942

File tree

483 files changed

+9395
-2981
lines changed

Some content is hidden

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

483 files changed

+9395
-2981
lines changed

.github/workflows/ci.yaml

Lines changed: 135 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
test_non_bootstrapped:
2929
runs-on: [self-hosted, Linux]
3030
container:
31-
image: lampepfl/dotty:2020-11-19
31+
image: lampepfl/dotty:2021-03-22
3232
options: --cpu-shares 4096
3333
volumes:
3434
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -49,8 +49,11 @@ jobs:
4949
&& github.repository == 'lampepfl/dotty'
5050
)"
5151
steps:
52-
- name: Set JDK 15 as default
53-
run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH
52+
- name: Set JDK 16 as default
53+
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
54+
55+
- name: Reset existing repo
56+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
5457

5558
- name: Checkout cleanup script
5659
uses: actions/checkout@v2
@@ -72,7 +75,7 @@ jobs:
7275
test:
7376
runs-on: [self-hosted, Linux]
7477
container:
75-
image: lampepfl/dotty:2020-11-19
78+
image: lampepfl/dotty:2021-03-22
7679
options: --cpu-shares 4096
7780
volumes:
7881
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -94,8 +97,11 @@ jobs:
9497
)"
9598

9699
steps:
97-
- name: Set JDK 15 as default
98-
run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH
100+
- name: Set JDK 16 as default
101+
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
102+
103+
- name: Reset existing repo
104+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
99105

100106
- name: Checkout cleanup script
101107
uses: actions/checkout@v2
@@ -132,13 +138,29 @@ jobs:
132138
)"
133139

134140
steps:
141+
- name: Reset existing repo
142+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
143+
shell: cmd
144+
135145
- name: Git Checkout
136146
uses: actions/checkout@v2
137147

138148
- name: Test
139149
run: sbt ";scala3-bootstrapped/compile"
140150
shell: cmd
141151

152+
- name: build binary
153+
run: sbt "dist/pack" & bash -version
154+
shell: cmd
155+
156+
- name: cygwin tests
157+
run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'
158+
shell: cmd
159+
160+
- name: msys tests
161+
run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
162+
shell: cmd
163+
142164
- name: Scala.js Test
143165
run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
144166
shell: cmd
@@ -157,6 +179,10 @@ jobs:
157179
)"
158180

159181
steps:
182+
- name: Reset existing repo
183+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
184+
shell: cmd
185+
160186
- name: Git Checkout
161187
uses: actions/checkout@v2
162188

@@ -171,7 +197,7 @@ jobs:
171197
community_build_a:
172198
runs-on: [self-hosted, Linux]
173199
container:
174-
image: lampepfl/dotty:2020-11-19
200+
image: lampepfl/dotty:2021-03-22
175201
options: --cpu-shares 4096
176202
volumes:
177203
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -190,6 +216,9 @@ jobs:
190216
)"
191217

192218
steps:
219+
- name: Reset existing repo
220+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
221+
193222
- name: Checkout cleanup script
194223
uses: actions/checkout@v2
195224

@@ -211,7 +240,7 @@ jobs:
211240
community_build_b:
212241
runs-on: [self-hosted, Linux]
213242
container:
214-
image: lampepfl/dotty:2020-11-19
243+
image: lampepfl/dotty:2021-03-22
215244
options: --cpu-shares 4096
216245
volumes:
217246
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -230,6 +259,9 @@ jobs:
230259
)"
231260

232261
steps:
262+
- name: Reset existing repo
263+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
264+
233265
- name: Checkout cleanup script
234266
uses: actions/checkout@v2
235267

@@ -248,7 +280,7 @@ jobs:
248280
git submodule update --init --recursive --jobs 7
249281
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
250282
251-
test_sbt:
283+
community_build_c:
252284
runs-on: [self-hosted, Linux]
253285
container:
254286
image: lampepfl/dotty:2020-11-19
@@ -262,14 +294,17 @@ jobs:
262294
|| (
263295
github.event_name == 'pull_request'
264296
&& !contains(github.event.pull_request.body, '[skip ci]')
265-
&& !contains(github.event.pull_request.body, '[skip test_sbt]')
297+
&& !contains(github.event.pull_request.body, '[skip community_build]')
266298
)
267299
|| (
268300
github.event_name == 'workflow_dispatch'
269301
&& github.repository == 'lampepfl/dotty'
270302
)"
271303

272304
steps:
305+
- name: Reset existing repo
306+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
307+
273308
- name: Checkout cleanup script
274309
uses: actions/checkout@v2
275310

@@ -283,12 +318,55 @@ jobs:
283318
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
284319

285320
- name: Test
321+
run: |
322+
git submodule sync
323+
git submodule update --init --recursive --jobs 7
324+
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
325+
326+
test_sbt:
327+
runs-on: [self-hosted, Linux]
328+
container:
329+
image: lampepfl/dotty:2021-03-22
330+
options: --cpu-shares 4096
331+
volumes:
332+
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
333+
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
334+
- ${{ github.workspace }}/../../cache/general:/root/.cache
335+
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
336+
|| github.event_name == 'push'
337+
|| (
338+
github.event_name == 'pull_request'
339+
&& !contains(github.event.pull_request.body, '[skip ci]')
340+
&& !contains(github.event.pull_request.body, '[skip test_sbt]')
341+
)
342+
|| (
343+
github.event_name == 'workflow_dispatch'
344+
&& github.repository == 'lampepfl/dotty'
345+
)"
346+
347+
steps:
348+
- name: Reset existing repo
349+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
350+
351+
- name: Checkout cleanup script
352+
uses: actions/checkout@v2
353+
354+
- name: Cleanup
355+
run: .github/workflows/cleanup.sh
356+
357+
- name: Git Checkout
358+
uses: actions/checkout@v2
359+
360+
- name: Add SBT proxy repositories
361+
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
362+
363+
- name: Test sbt
286364
run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
287365

288366
test_java8:
289367
runs-on: [self-hosted, Linux]
290368
container:
291-
image: lampepfl/dotty:2020-11-19
369+
image: lampepfl/dotty:2021-03-22
292370
options: --cpu-shares 4096
293371
volumes:
294372
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -315,6 +393,9 @@ jobs:
315393
- name: Set JDK 8 as default
316394
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
317395

396+
- name: Reset existing repo
397+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
398+
318399
- name: Checkout cleanup script
319400
uses: actions/checkout@v2
320401

@@ -335,13 +416,13 @@ jobs:
335416
publish_nightly:
336417
runs-on: [self-hosted, Linux]
337418
container:
338-
image: lampepfl/dotty:2020-11-19
419+
image: lampepfl/dotty:2021-03-22
339420
options: --cpu-shares 4096
340421
volumes:
341422
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
342423
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
343424
- ${{ github.workspace }}/../../cache/general:/root/.cache
344-
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
425+
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
345426
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
346427
env:
347428
NIGHTLYBUILD: yes
@@ -351,6 +432,9 @@ jobs:
351432
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}
352433

353434
steps:
435+
- name: Reset existing repo
436+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
437+
354438
- name: Checkout cleanup script
355439
uses: actions/checkout@v2
356440

@@ -370,7 +454,7 @@ jobs:
370454
nightly_documentation:
371455
runs-on: [self-hosted, Linux]
372456
container:
373-
image: lampepfl/dotty:2020-11-19
457+
image: lampepfl/dotty:2021-03-22
374458
options: --cpu-shares 4096
375459
volumes:
376460
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -385,6 +469,9 @@ jobs:
385469
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
386470

387471
steps:
472+
- name: Reset existing repo
473+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
474+
388475
- name: Checkout cleanup script
389476
uses: actions/checkout@v2
390477

@@ -412,13 +499,13 @@ jobs:
412499
publish_release:
413500
runs-on: [self-hosted, Linux]
414501
container:
415-
image: lampepfl/dotty:2020-11-19
502+
image: lampepfl/dotty:2021-03-22
416503
options: --cpu-shares 4096
417504
volumes:
418505
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
419506
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
420507
- ${{ github.workspace }}/../../cache/general:/root/.cache
421-
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
508+
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
422509
if: "github.event_name == 'push'
423510
&& startsWith(github.event.ref, 'refs/tags/')
424511
&& !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
@@ -431,6 +518,9 @@ jobs:
431518
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}
432519

433520
steps:
521+
- name: Reset existing repo
522+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
523+
434524
- name: Checkout cleanup script
435525
uses: actions/checkout@v2
436526

@@ -495,7 +585,7 @@ jobs:
495585
release_documentation:
496586
runs-on: [self-hosted, Linux]
497587
container:
498-
image: lampepfl/dotty:2020-11-19
588+
image: lampepfl/dotty:2021-03-22
499589
options: --cpu-shares 4096
500590
volumes:
501591
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -513,6 +603,9 @@ jobs:
513603
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
514604

515605
steps:
606+
- name: Reset existing repo
607+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
608+
516609
- name: Checkout cleanup script
517610
uses: actions/checkout@v2
518611

@@ -540,13 +633,13 @@ jobs:
540633
publish_sbt_release:
541634
runs-on: [self-hosted, Linux]
542635
container:
543-
image: lampepfl/dotty:2020-11-19
636+
image: lampepfl/dotty:2021-03-22
544637
options: --cpu-shares 4096
545638
volumes:
546639
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
547640
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
548641
- ${{ github.workspace }}/../../cache/general:/root/.cache
549-
needs: [community_build_a, community_build_b, test_sbt]
642+
needs: [community_build_a, community_build_b, community_build_c, test_sbt]
550643
if: "github.event_name == 'push'
551644
&& startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
552645

@@ -558,6 +651,9 @@ jobs:
558651
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
559652

560653
steps:
654+
- name: Reset existing repo
655+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
656+
561657
- name: Checkout cleanup script
562658
uses: actions/checkout@v2
563659

@@ -573,3 +669,23 @@ jobs:
573669
- name: Publish Dotty SBT Plugin Release
574670
run: |
575671
./project/scripts/sbtPublish ";project sbt-dotty ;publishSigned ;sonatypeBundleRelease"
672+
673+
open_issue_on_failure:
674+
runs-on: [self-hosted, Linux]
675+
container:
676+
image: lampepfl/dotty:2021-03-22
677+
needs: [nightly_documentation, test_windows_full]
678+
# The `failure()` expression is true iff at least one of the dependencies
679+
# of this job (including transitive dependencies) has failed.
680+
if: "failure() && github.event_name == 'schedule'"
681+
steps:
682+
- name: Checkout issue template
683+
uses: actions/checkout@v2
684+
685+
- name: Open an issue
686+
uses: JasonEtco/create-an-issue@v2
687+
env:
688+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
689+
WORKFLOW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
690+
with:
691+
filename: .github/workflows/issue_nightly_failed.md
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Nightly {{ workflow }} workflow of {{ date | date('YYYY-MM-DD') }} failed
3+
labels: itype:bug, prio:blocker
4+
---
5+
See {{ env.WORKFLOW_RUN_URL }}

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
[submodule "community-build/community-projects/stdLib213"]
2626
path = community-build/community-projects/stdLib213
2727
url = https://github.com/dotty-staging/scala
28-
[submodule "community-build/community-projects/pdbp"]
29-
path = community-build/community-projects/pdbp
30-
url = https://github.com/dotty-staging/pdbp
3128
[submodule "community-build/community-projects/sourcecode"]
3229
path = community-build/community-projects/sourcecode
3330
url = https://github.com/dotty-staging/sourcecode

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ val `scala3-interfaces` = Build.`scala3-interfaces`
44
val `scala3-compiler` = Build.`scala3-compiler`
55
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
66
val `scala3-library` = Build.`scala3-library`
7+
val `scala3-library-js` = Build.`scala3-library-js`
78
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
89
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
910
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
@@ -22,7 +23,9 @@ val `tasty-core-scala2` = Build.`tasty-core-scala2`
2223
val scaladoc = Build.scaladoc
2324
val `scaladoc-nonBootstrapped` = Build.`scaladoc-nonBootstrapped`
2425
val `scaladoc-testcases` = Build.`scaladoc-testcases`
26+
val `scaladoc-testcases-nonBootstrapped` = Build.`scaladoc-testcases-nonBootstrapped`
2527
val `scaladoc-js` = Build.`scaladoc-js`
28+
val `scaladoc-js-nonBootstrapped` = Build.`scaladoc-js-nonBootstrapped`
2629
val `scala3-bench-run` = Build.`scala3-bench-run`
2730
val dist = Build.dist
2831
val `community-build` = Build.`community-build`

0 commit comments

Comments
 (0)