Skip to content

Commit d38c7f8

Browse files
HarrisL2HarrisL2
committed
Merge branch 'main' into explicit-nulls-communitybuild
2 parents d50c908 + edfb79d commit d38c7f8

File tree

7 files changed

+8
-289
lines changed

7 files changed

+8
-289
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 267 deletions
Original file line numberDiff line numberDiff line change
@@ -51,99 +51,6 @@ env:
5151
# text on stderr and so can break tests which check the output of a program).
5252

5353
jobs:
54-
test:
55-
runs-on: [self-hosted, Linux]
56-
container:
57-
image: lampepfl/dotty:2024-10-18
58-
options: --cpu-shares 4096
59-
volumes:
60-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
61-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
62-
- ${{ github.workspace }}/../../cache/general:/root/.cache
63-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
64-
|| github.event_name == 'push'
65-
|| github.event_name == 'merge_group'
66-
|| (
67-
github.event_name == 'pull_request'
68-
&& !contains(github.event.pull_request.body, '[skip ci]')
69-
&& !contains(github.event.pull_request.body, '[skip test]')
70-
)
71-
|| (
72-
github.event_name == 'workflow_dispatch'
73-
&& github.repository == 'scala/scala3'
74-
)"
75-
76-
steps:
77-
- name: Set JDK 17 as default
78-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
79-
80-
- name: Reset existing repo
81-
run: |
82-
git config --global --add safe.directory $GITHUB_WORKSPACE
83-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
84-
85-
- name: Checkout cleanup script
86-
uses: actions/checkout@v5
87-
88-
- name: Cleanup
89-
run: .github/workflows/cleanup.sh
90-
91-
- name: Git Checkout
92-
uses: actions/checkout@v5
93-
94-
- name: Add SBT proxy repositories
95-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
96-
97-
- name: Cmd Tests
98-
run: |
99-
./project/scripts/buildScalaBinary
100-
./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/publishLocal ;scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
101-
./project/scripts/cmdTests
102-
./project/scripts/bootstrappedOnlyCmdTests
103-
104-
test_windows_fast:
105-
runs-on: [self-hosted, Windows]
106-
if: "(
107-
github.event_name == 'push'
108-
&& github.ref != 'refs/heads/main'
109-
)
110-
|| github.event_name == 'merge_group'
111-
|| (
112-
github.event_name == 'pull_request'
113-
&& !contains(github.event.pull_request.body, '[skip ci]')
114-
&& !contains(github.event.pull_request.body, '[skip test_windows_fast]')
115-
)"
116-
117-
steps:
118-
- name: Reset existing repo
119-
shell: cmd
120-
run: |
121-
git config --global --add safe.directory $GITHUB_WORKSPACE
122-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
123-
124-
- name: Git Checkout
125-
uses: actions/checkout@v5
126-
127-
- name: Test
128-
run: sbt ";scala3-bootstrapped/compile; scala3-presentation-compiler/test; scala3-language-server/test"
129-
shell: cmd
130-
131-
- name: build binary
132-
run: sbt "dist-win-x86_64/Universal/stage" & bash -version
133-
shell: cmd
134-
135-
- name: cygwin tests
136-
run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'
137-
shell: cmd
138-
139-
- name: msys tests
140-
run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
141-
shell: cmd
142-
143-
- name: win tests
144-
run: './project/scripts/winCmdTests.bat'
145-
shell: cmd
146-
14754
test_windows_full:
14855
runs-on: [self-hosted, Windows]
14956
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
@@ -168,177 +75,6 @@ jobs:
16875
run: sbt ";scala3-bootstrapped-new/compile ;scala3-compiler-bootstrapped-new/test"
16976
shell: cmd
17077

171-
community_build_a:
172-
runs-on: [self-hosted, Linux]
173-
container:
174-
image: lampepfl/dotty:2024-10-18
175-
options: --cpu-shares 4096
176-
volumes:
177-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
178-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
179-
- ${{ github.workspace }}/../../cache/general:/root/.cache
180-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
181-
|| github.event_name == 'push'
182-
|| github.event_name == 'merge_group'
183-
|| (
184-
github.event_name == 'pull_request'
185-
&& !contains(github.event.pull_request.body, '[skip ci]')
186-
&& !contains(github.event.pull_request.body, '[skip community_build]')
187-
&& !contains(github.event.pull_request.body, '[skip community_build_a]')
188-
)
189-
|| (
190-
github.event_name == 'workflow_dispatch'
191-
&& github.repository == 'scala/scala3'
192-
)"
193-
194-
steps:
195-
##############################################################################################
196-
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
197-
##############################################################################################
198-
- name: Set JDK 17 as default
199-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
200-
- name: Reset existing repo
201-
run: |
202-
git config --global --add safe.directory $GITHUB_WORKSPACE
203-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
204-
205-
- name: Checkout cleanup script
206-
uses: actions/checkout@v5
207-
208-
- name: Cleanup
209-
run: .github/workflows/cleanup.sh
210-
211-
- name: Git Checkout
212-
uses: actions/checkout@v5
213-
214-
- name: Add SBT proxy repositories
215-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
216-
217-
- name: Test
218-
run: |
219-
git config --global --add safe.directory $GITHUB_WORKSPACE
220-
git submodule sync
221-
git submodule update --init --recursive --jobs 7
222-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
223-
224-
- name: Show dependency tracking file
225-
if: ${{ always() }}
226-
run: cat community-build/dotty-community-build-deps || true
227-
228-
community_build_b:
229-
runs-on: [self-hosted, Linux]
230-
container:
231-
image: lampepfl/dotty:2024-10-18
232-
options: --cpu-shares 4096
233-
volumes:
234-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
235-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
236-
- ${{ github.workspace }}/../../cache/general:/root/.cache
237-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
238-
|| github.event_name == 'push'
239-
|| github.event_name == 'merge_group'
240-
|| (
241-
github.event_name == 'pull_request'
242-
&& !contains(github.event.pull_request.body, '[skip ci]')
243-
&& !contains(github.event.pull_request.body, '[skip community_build]')
244-
&& !contains(github.event.pull_request.body, '[skip community_build_b]')
245-
)
246-
|| (
247-
github.event_name == 'workflow_dispatch'
248-
&& github.repository == 'scala/scala3'
249-
)"
250-
251-
steps:
252-
##############################################################################################
253-
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
254-
##############################################################################################
255-
- name: Set JDK 17 as default
256-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
257-
- name: Reset existing repo
258-
run: |
259-
git config --global --add safe.directory $GITHUB_WORKSPACE
260-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
261-
262-
- name: Checkout cleanup script
263-
uses: actions/checkout@v5
264-
265-
- name: Cleanup
266-
run: .github/workflows/cleanup.sh
267-
268-
- name: Git Checkout
269-
uses: actions/checkout@v5
270-
271-
- name: Add SBT proxy repositories
272-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
273-
274-
- name: Test
275-
run: |
276-
git config --global --add safe.directory $GITHUB_WORKSPACE
277-
git submodule sync
278-
git submodule update --init --recursive --jobs 7
279-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
280-
281-
- name: Show dependency tracking file
282-
if: ${{ always() }}
283-
run: cat community-build/dotty-community-build-deps || true
284-
285-
community_build_c:
286-
runs-on: [self-hosted, Linux]
287-
container:
288-
image: lampepfl/dotty:2024-10-18
289-
options: --cpu-shares 4096
290-
volumes:
291-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
292-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
293-
- ${{ github.workspace }}/../../cache/general:/root/.cache
294-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
295-
|| github.event_name == 'push'
296-
|| github.event_name == 'merge_group'
297-
|| (
298-
github.event_name == 'pull_request'
299-
&& !contains(github.event.pull_request.body, '[skip ci]')
300-
&& !contains(github.event.pull_request.body, '[skip community_build]')
301-
&& !contains(github.event.pull_request.body, '[skip community_build_c]')
302-
)
303-
|| (
304-
github.event_name == 'workflow_dispatch'
305-
&& github.repository == 'scala/scala3'
306-
)"
307-
308-
steps:
309-
##############################################################################################
310-
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
311-
##############################################################################################
312-
- name: Set JDK 17 as default
313-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
314-
- name: Reset existing repo
315-
run: |
316-
git config --global --add safe.directory $GITHUB_WORKSPACE
317-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
318-
319-
- name: Checkout cleanup script
320-
uses: actions/checkout@v5
321-
322-
- name: Cleanup
323-
run: .github/workflows/cleanup.sh
324-
325-
- name: Git Checkout
326-
uses: actions/checkout@v5
327-
328-
- name: Add SBT proxy repositories
329-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
330-
331-
- name: Test
332-
run: |
333-
git config --global --add safe.directory $GITHUB_WORKSPACE
334-
git submodule sync
335-
git submodule update --init --recursive --jobs 7
336-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
337-
338-
- name: Show dependency tracking file
339-
if: ${{ always() }}
340-
run: cat community-build/dotty-community-build-deps || true
341-
34278
publish_release:
34379
permissions:
34480
contents: write # for GH CLI to create a release
@@ -350,9 +86,7 @@ jobs:
35086
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
35187
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
35288
- ${{ github.workspace }}/../../cache/general:/root/.cache
353-
needs: [test, community_build_a, community_build_b, community_build_c, build-sdk-package, build-msi-package]
354-
if: "github.event_name == 'push'
355-
&& startsWith(github.event.ref, 'refs/tags/')"
89+
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
35690

35791
env:
35892
RELEASEBUILD: yes

‎.github/workflows/stdlib.yaml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -722,20 +722,3 @@ jobs:
722722
- name: Run Community Build C
723723
run: |
724724
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
725-
726-
scripted-tests:
727-
runs-on: ubuntu-latest
728-
needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]
729-
steps:
730-
- name: Git Checkout
731-
uses: actions/checkout@v5
732-
733-
- name: Set up JDK 17
734-
uses: actions/setup-java@v5
735-
with:
736-
distribution: 'temurin'
737-
java-version: 17
738-
cache: 'sbt'
739-
- uses: sbt/setup-sbt@v1
740-
- name: Run SBT scripted tests
741-
run: ./project/scripts/sbt scala3-bootstrapped-new/scripted

‎community-build/community-projects/akka‎

‎community-build/community-projects/scalatestplus-testng‎

‎community-build/community-projects/scas‎

‎community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ end CommunityBuildTestB
5757

5858
@Category(Array(classOf[TestCategory]))
5959
class CommunityBuildTestC:
60-
// @Test def akka = projects.akka.run()
60+
//@Test def akka = projects.akka.run()
6161
// Disabled because `javax.xml.bind` is not available since java 11
6262
// @Test def betterfiles = projects.betterfiles.run()
6363
@Test def cask = projects.cask.run()

‎project/Build.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,7 @@ object Build {
800800
// ==============================================================================================
801801

802802
lazy val `scala3-bootstrapped-new` = project
803+
.enablePlugins(ScriptedPlugin)
803804
.aggregate(`scala3-interfaces`, `scala3-library-bootstrapped-new` , `scala-library-bootstrapped`,
804805
`tasty-core-bootstrapped-new`, `scala3-compiler-bootstrapped-new`, `scala3-sbt-bridge-bootstrapped`,
805806
`scala3-staging-new`, `scala3-tasty-inspector-new`, `scala-library-sjs`, `scala3-library-sjs`,
@@ -896,7 +897,7 @@ object Build {
896897
scriptedBatchExecution := true,
897898
scriptedLaunchOpts ++= Seq(
898899
s"-Dplugin.scalaVersion=${dottyVersion}",
899-
s"-Dplugin.scala2Version=${stdlibVersion(Bootstrapped)}",
900+
s"-Dplugin.scala2Version=2.13.16",
900901
s"-Dplugin.scalaJSVersion=${scalaJSVersion}",
901902
),
902903
scriptedBufferLog := true,
@@ -912,6 +913,7 @@ object Build {
912913
(`scala3-staging-new` / publishLocalBin),
913914
(`scala3-tasty-inspector-new` / publishLocalBin),
914915
(`scaladoc-new` / publishLocalBin),
916+
(`scala3-repl` / publishLocalBin),
915917
publishLocalBin,
916918
).evaluated,
917919
)

0 commit comments

Comments
 (0)