Skip to content

Commit 39e255e

Browse files
ghostbuster91ghostbuster91
authored
Merge branch 'main' into diag-act-members
2 parents 7f9b524 + 45ad465 commit 39e255e

File tree

426 files changed

+12331
-1869
lines changed

Some content is hidden

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

426 files changed

+12331
-1869
lines changed

‎.github/workflows/build-msi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-java@v4
2626
with:
2727
distribution: 'adopt'
28-
java-version: '8'
28+
java-version: 17
2929
cache: 'sbt'
3030
- name: Build MSI package
3131
run: sbt 'dist-win-x86_64/Windows/packageBin'

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ jobs:
898898
# Ensure that version starts with prefix 3.
899899
# In the future it can be adapted to compare with git tag or version set in the project/Build.scala
900900
version: "3."
901-
java-version: 8
901+
java-version: 17
902902

903903
build-sdk-package:
904904
uses: ./.github/workflows/build-sdk.yml
@@ -909,7 +909,7 @@ jobs:
909909
github.event_name == 'push' ||
910910
github.event_name == 'merge_group'
911911
with:
912-
java-version: 8
912+
java-version: 17
913913

914914
build-chocolatey-package:
915915
uses: ./.github/workflows/build-chocolatey.yml
@@ -923,6 +923,6 @@ jobs:
923923
uses: ./.github/workflows/test-chocolatey.yml
924924
with:
925925
version : 3.6.0-SNAPSHOT # Fake version, used only for choco tests
926-
java-version: 8
926+
java-version: 17
927927
if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
928928
needs: [ build-chocolatey-package ]

‎.github/workflows/releases.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
needs: build-chocolatey
6161
with:
6262
version : ${{ inputs.version }}
63-
java-version: 8
63+
java-version: 17
6464
publish-chocolatey:
6565
uses: ./.github/workflows/publish-chocolatey.yml
6666
needs: [ build-chocolatey, test-chocolatey ]
@@ -69,4 +69,4 @@ jobs:
6969
secrets:
7070
API-KEY: ${{ secrets.CHOCOLATEY_KEY }}
7171

72-
# TODO: ADD RELEASE WORKFLOW TO CHOCOLATEY AND OTHER PACKAGE MANAGERS HERE
72+
# TODO: ADD RELEASE WORKFLOW TO CHOCOLATEY AND OTHER PACKAGE MANAGERS HERE

‎.github/workflows/stdlib.yaml‎

Lines changed: 248 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
compile-nonbootstrapped:
13+
scala-library-nonbootstrapped:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Git Checkout
@@ -27,8 +27,27 @@ jobs:
2727
- name: Compile `scala-library-nonbootstrapped`
2828
run: ./project/scripts/sbt scala-library-nonbootstrapped/compile
2929

30-
compile-bootstrapped:
30+
scala3-library-nonbootstrapped:
3131
runs-on: ubuntu-latest
32+
##needs: [scala-library-nonbootstrapped] Add when we add support for caching here
33+
steps:
34+
- name: Git Checkout
35+
uses: actions/checkout@v4
36+
37+
- name: Set up JDK 17
38+
uses: actions/setup-java@v4
39+
with:
40+
distribution: 'temurin'
41+
java-version: 17
42+
cache: 'sbt'
43+
44+
- uses: sbt/setup-sbt@v1
45+
- name: Compile `scala3-library-nonbootstrapped`
46+
run: ./project/scripts/sbt scala3-library-nonbootstrapped/compile
47+
48+
scala-library-bootstrapped:
49+
runs-on: ubuntu-latest
50+
needs : [scala3-compiler-nonbootstrapped, scala3-sbt-bridge-nonbootstrapped, scala-library-nonbootstrapped, scala3-library-nonbootstrapped]
3251
steps:
3352
- name: Git Checkout
3453
uses: actions/checkout@v4
@@ -44,3 +63,230 @@ jobs:
4463
- name: Compile `scala-library-bootstrapped`
4564
run: ./project/scripts/sbt scala-library-bootstrapped/compile
4665

66+
scala3-library-bootstrapped:
67+
runs-on: ubuntu-latest
68+
##needs: [scala-library-bootstrapped] Add when we add support for caching here
69+
steps:
70+
- name: Git Checkout
71+
uses: actions/checkout@v4
72+
73+
- name: Set up JDK 17
74+
uses: actions/setup-java@v4
75+
with:
76+
distribution: 'temurin'
77+
java-version: 17
78+
cache: 'sbt'
79+
80+
- uses: sbt/setup-sbt@v1
81+
- name: Compile `scala3-library-bootstrapped`
82+
run: ./project/scripts/sbt scala3-library-bootstrapped-new/compile
83+
84+
tasty-core-nonbootstrapped:
85+
runs-on: ubuntu-latest
86+
##needs: [scala3-library-nonbootstrapped] Add when we add support for caching here
87+
steps:
88+
- name: Git Checkout
89+
uses: actions/checkout@v4
90+
91+
- name: Set up JDK 17
92+
uses: actions/setup-java@v4
93+
with:
94+
distribution: 'temurin'
95+
java-version: 17
96+
cache: 'sbt'
97+
- uses: sbt/setup-sbt@v1
98+
- name: Compile `tasty-core-nonbootstrapped`
99+
run: ./project/scripts/sbt tasty-core-nonbootstrapped/compile
100+
101+
scala3-compiler-nonbootstrapped:
102+
runs-on: ubuntu-latest
103+
##needs: [tasty-core-nonbootstrapped, scala3-library-nonbootstrapped] Add when we add support for caching here
104+
steps:
105+
- name: Git Checkout
106+
uses: actions/checkout@v4
107+
108+
- name: Set up JDK 17
109+
uses: actions/setup-java@v4
110+
with:
111+
distribution: 'temurin'
112+
java-version: 17
113+
cache: 'sbt'
114+
- uses: sbt/setup-sbt@v1
115+
- name: Compile `scala3-compiler-nonbootstrapped`
116+
run: ./project/scripts/sbt scala3-compiler-nonbootstrapped/compile
117+
118+
scala3-sbt-bridge-nonbootstrapped:
119+
runs-on: ubuntu-latest
120+
##needs: [scala3-compiler-nonbootstrapped] Add when we add support for caching here
121+
steps:
122+
- name: Git Checkout
123+
uses: actions/checkout@v4
124+
125+
- name: Set up JDK 17
126+
uses: actions/setup-java@v4
127+
with:
128+
distribution: 'temurin'
129+
java-version: 17
130+
cache: 'sbt'
131+
- uses: sbt/setup-sbt@v1
132+
- name: Compile `scala3-sbt-bridge-nonbootstrapped`
133+
run: ./project/scripts/sbt scala3-sbt-bridge-nonbootstrapped/compile
134+
135+
tasty-core-bootstrapped:
136+
runs-on: ubuntu-latest
137+
##needs: [scala3-library-bootstrapped] Add when we add support for caching here
138+
steps:
139+
- name: Git Checkout
140+
uses: actions/checkout@v4
141+
142+
- name: Set up JDK 17
143+
uses: actions/setup-java@v4
144+
with:
145+
distribution: 'temurin'
146+
java-version: 17
147+
cache: 'sbt'
148+
- uses: sbt/setup-sbt@v1
149+
- name: Compile `tasty-core-bootstrapped`
150+
run: ./project/scripts/sbt tasty-core-bootstrapped-new/compile
151+
152+
scala3-compiler-bootstrapped:
153+
runs-on: ubuntu-latest
154+
##needs: [tasty-core-bootstrapped, scala3-library-bootstrapped] Add when we add support for caching here
155+
steps:
156+
- name: Git Checkout
157+
uses: actions/checkout@v4
158+
159+
- name: Set up JDK 17
160+
uses: actions/setup-java@v4
161+
with:
162+
distribution: 'temurin'
163+
java-version: 17
164+
cache: 'sbt'
165+
- uses: sbt/setup-sbt@v1
166+
- name: Compile `scala3-compiler-bootstrapped`
167+
run: ./project/scripts/sbt scala3-compiler-bootstrapped-new/compile
168+
169+
scala3-sbt-bridge-bootstrapped:
170+
runs-on: ubuntu-latest
171+
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
172+
steps:
173+
- name: Git Checkout
174+
uses: actions/checkout@v4
175+
176+
- name: Set up JDK 17
177+
uses: actions/setup-java@v4
178+
with:
179+
distribution: 'temurin'
180+
java-version: 17
181+
cache: 'sbt'
182+
- uses: sbt/setup-sbt@v1
183+
- name: Compile `scala3-sbt-bridge-bootstrapped`
184+
run: ./project/scripts/sbt scala3-sbt-bridge-bootstrapped/compile
185+
186+
scala3-staging:
187+
runs-on: ubuntu-latest
188+
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
189+
steps:
190+
- name: Git Checkout
191+
uses: actions/checkout@v4
192+
193+
- name: Set up JDK 17
194+
uses: actions/setup-java@v4
195+
with:
196+
distribution: 'temurin'
197+
java-version: 17
198+
cache: 'sbt'
199+
- uses: sbt/setup-sbt@v1
200+
- name: Compile `scala3-staging`
201+
run: ./project/scripts/sbt scala3-staging-new/compile
202+
203+
scala3-tasty-inspector:
204+
runs-on: ubuntu-latest
205+
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
206+
steps:
207+
- name: Git Checkout
208+
uses: actions/checkout@v4
209+
210+
- name: Set up JDK 17
211+
uses: actions/setup-java@v4
212+
with:
213+
distribution: 'temurin'
214+
java-version: 17
215+
cache: 'sbt'
216+
- uses: sbt/setup-sbt@v1
217+
- name: Compile `scala3-staging`
218+
run: ./project/scripts/sbt scala3-staging-new/compile
219+
- name: Compile `scala3-tasty-inspector`
220+
run: ./project/scripts/sbt scala3-tasty-inspector-new/compile
221+
222+
#################################################################################################
223+
########################################### TEST JOBS ###########################################
224+
#################################################################################################
225+
226+
test-scala3-sbt-bridge-nonbootstrapped:
227+
runs-on: ubuntu-latest
228+
##needs: [scala3-sbt-bridge-nonbootstrapped] Add when we add support for caching here
229+
steps:
230+
- name: Git Checkout
231+
uses: actions/checkout@v4
232+
233+
- name: Set up JDK 17
234+
uses: actions/setup-java@v4
235+
with:
236+
distribution: 'temurin'
237+
java-version: 17
238+
cache: 'sbt'
239+
- uses: sbt/setup-sbt@v1
240+
- name: Test `scala3-sbt-bridge-nonbootstrapped`
241+
run: ./project/scripts/sbt scala3-sbt-bridge-nonbootstrapped/test
242+
243+
test-scala3-sbt-bridge-bootstrapped:
244+
runs-on: ubuntu-latest
245+
##needs: [scala3-sbt-bridge-bootstrapped] Add when we add support for caching here
246+
steps:
247+
- name: Git Checkout
248+
uses: actions/checkout@v4
249+
250+
- name: Set up JDK 17
251+
uses: actions/setup-java@v4
252+
with:
253+
distribution: 'temurin'
254+
java-version: 17
255+
cache: 'sbt'
256+
- uses: sbt/setup-sbt@v1
257+
- name: Test `scala3-sbt-bridge-bootstrapped`
258+
run: ./project/scripts/sbt scala3-sbt-bridge-bootstrapped/test
259+
260+
test-tasty-core-nonbootstrapped:
261+
runs-on: ubuntu-latest
262+
##needs: [tasty-core-nonbootstrapped] Add when we add support for caching here
263+
steps:
264+
- name: Git Checkout
265+
uses: actions/checkout@v4
266+
267+
- name: Set up JDK 17
268+
uses: actions/setup-java@v4
269+
with:
270+
distribution: 'temurin'
271+
java-version: 17
272+
cache: 'sbt'
273+
- uses: sbt/setup-sbt@v1
274+
- name: Test `tasty-core-nonbootstrapped`
275+
run: ./project/scripts/sbt tasty-core-nonbootstrapped/test
276+
277+
test-tasty-core-bootstrapped:
278+
runs-on: ubuntu-latest
279+
##needs: [tasty-core-bootstrapped] Add when we add support for caching here
280+
steps:
281+
- name: Git Checkout
282+
uses: actions/checkout@v4
283+
284+
- name: Set up JDK 17
285+
uses: actions/setup-java@v4
286+
with:
287+
distribution: 'temurin'
288+
java-version: 17
289+
cache: 'sbt'
290+
- uses: sbt/setup-sbt@v1
291+
- name: Test `tasty-core-bootstrapped`
292+
run: ./project/scripts/sbt tasty-core-bootstrapped-new/test

‎.jvmopts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-Xss1m
1+
-Xss2m
22
-Xms1024m
33
-Xmx8192m
44
-XX:MaxInlineLevel=35

‎build.sbt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
val scala3 = Build.scala3
2+
val `scala3-nonbootstrapped` = Build.`scala3-nonbootstrapped`
23
val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
4+
val `scala3-bootstrapped-new` = Build.`scala3-bootstrapped-new`
35
val `scala3-interfaces` = Build.`scala3-interfaces`
46
val `scala3-compiler` = Build.`scala3-compiler`
7+
val `scala3-compiler-nonbootstrapped` = Build.`scala3-compiler-nonbootstrapped`
8+
val `scala3-compiler-bootstrapped-new` = Build.`scala3-compiler-bootstrapped-new`
59
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
610
val `scala-library-nonbootstrapped` = Build.`scala-library-nonbootstrapped`
11+
val `scala3-library-nonbootstrapped` = Build.`scala3-library-nonbootstrapped`
712
val `scala-library-bootstrapped` = Build.`scala-library-bootstrapped`
13+
val `scala3-library-bootstrapped-new` = Build.`scala3-library-bootstrapped-new`
814
val `scala3-library` = Build.`scala3-library`
915
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1016
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
1117
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
18+
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
19+
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
1220
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
1321
val `scala3-staging` = Build.`scala3-staging`
22+
val `scala3-staging-new` = Build.`scala3-staging-new`
1423
val `scala3-tasty-inspector` = Build.`scala3-tasty-inspector`
24+
val `scala3-tasty-inspector-new` = Build.`scala3-tasty-inspector-new`
1525
val `scala3-language-server` = Build.`scala3-language-server`
1626
val `scala3-bench` = Build.`scala3-bench`
1727
val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
@@ -21,6 +31,8 @@ val `scala2-library-tasty` = Build.`scala2-library-tasty`
2131
val `scala2-library-cc` = Build.`scala2-library-cc`
2232
val `scala2-library-cc-tasty` = Build.`scala2-library-cc-tasty`
2333
val `tasty-core` = Build.`tasty-core`
34+
val `tasty-core-nonbootstrapped` = Build.`tasty-core-nonbootstrapped`
35+
val `tasty-core-bootstrapped-new` = Build.`tasty-core-bootstrapped-new`
2436
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
2537
val `tasty-core-scala2` = Build.`tasty-core-scala2`
2638
val scaladoc = Build.scaladoc

0 commit comments

Comments
 (0)