Skip to content

Commit 47a452d

Browse files
authored
chore: add the base projects as bootstrapped in the new build (#23608)
Fix missing `scala-sbt-bridge-nonbootstrapped` to include the resources folder - Fix `scala-library-bootstrapped` to use the non-bootstrapped compiler to compile - Add `tasty-core-bootstrapped` - Add `scala3-compiler-bootstrapped` - Add `scala3-sbt-bridge-bootstrapped` - Add root project `scala3-boostrapped`
2 parents 1148afe + d0f3b9f commit 47a452d

File tree

3 files changed

+339
-17
lines changed

3 files changed

+339
-17
lines changed

.github/workflows/stdlib.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747

4848
scala-library-bootstrapped:
4949
runs-on: ubuntu-latest
50+
needs : [scala3-compiler-nonbootstrapped, scala3-sbt-bridge-nonbootstrapped, scala-library-nonbootstrapped, scala3-library-nonbootstrapped]
5051
steps:
5152
- name: Git Checkout
5253
uses: actions/checkout@v4
@@ -130,3 +131,54 @@ jobs:
130131
- uses: sbt/setup-sbt@v1
131132
- name: Compile `scala3-sbt-bridge-nonbootstrapped`
132133
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

build.sbt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
val scala3 = Build.scala3
22
val `scala3-nonbootstrapped` = Build.`scala3-nonbootstrapped`
33
val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
4+
val `scala3-bootstrapped-new` = Build.`scala3-bootstrapped-new`
45
val `scala3-interfaces` = Build.`scala3-interfaces`
56
val `scala3-compiler` = Build.`scala3-compiler`
67
val `scala3-compiler-nonbootstrapped` = Build.`scala3-compiler-nonbootstrapped`
8+
val `scala3-compiler-bootstrapped-new` = Build.`scala3-compiler-bootstrapped-new`
79
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
810
val `scala-library-nonbootstrapped` = Build.`scala-library-nonbootstrapped`
911
val `scala3-library-nonbootstrapped` = Build.`scala3-library-nonbootstrapped`
@@ -13,6 +15,7 @@ val `scala3-library` = Build.`scala3-library`
1315
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
1416
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
1517
val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
18+
val `scala3-sbt-bridge-bootstrapped` = Build.`scala3-sbt-bridge-bootstrapped`
1619
val `scala3-sbt-bridge-nonbootstrapped` = Build.`scala3-sbt-bridge-nonbootstrapped`
1720
val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
1821
val `scala3-staging` = Build.`scala3-staging`
@@ -27,6 +30,7 @@ val `scala2-library-cc` = Build.`scala2-library-cc`
2730
val `scala2-library-cc-tasty` = Build.`scala2-library-cc-tasty`
2831
val `tasty-core` = Build.`tasty-core`
2932
val `tasty-core-nonbootstrapped` = Build.`tasty-core-nonbootstrapped`
33+
val `tasty-core-bootstrapped-new` = Build.`tasty-core-bootstrapped-new`
3034
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
3135
val `tasty-core-scala2` = Build.`tasty-core-scala2`
3236
val scaladoc = Build.scaladoc

0 commit comments

Comments
 (0)