Skip to content

Commit d5013ad

Browse files
WojciechMazurWojciechMazur
authored
Backport "connect CB with the new artifacts" to 3.8.0 (#24403)
Backports #24177 to the 3.8.0-RC1. PR submitted by the release tooling.
2 parents 6934c68 + ef57e58 commit d5013ad

File tree

28 files changed

+114
-226
lines changed

28 files changed

+114
-226
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -168,177 +168,6 @@ jobs:
168168
run: sbt ";scala3-bootstrapped-new/compile ;scala3-compiler-bootstrapped-new/test"
169169
shell: cmd
170170

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-
342171
publish_release:
343172
permissions:
344173
contents: write # for GH CLI to create a release
@@ -350,9 +179,8 @@ jobs:
350179
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
351180
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
352181
- ${{ 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/')"
182+
needs: [test, build-sdk-package, build-msi-package]
183+
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
356184

357185
env:
358186
RELEASEBUILD: yes

‎.github/workflows/stdlib.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,3 +598,58 @@ jobs:
598598
- uses: sbt/setup-sbt@v1
599599
- name: Run SBT scripted tests
600600
run: ./project/scripts/sbt scala3-bootstrapped-new/scripted
601+
602+
community_build_a:
603+
runs-on: ubuntu-latest
604+
steps:
605+
- name: Checkout cleanup script
606+
uses: actions/checkout@v5
607+
with:
608+
submodules: true
609+
- name: Set up JDK 17
610+
uses: actions/setup-java@v5
611+
with:
612+
distribution: 'temurin'
613+
java-version: 17
614+
cache: 'sbt'
615+
- uses: sbt/setup-sbt@v1
616+
- name: Run Community Build A
617+
run: |
618+
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
619+
620+
community_build_b:
621+
runs-on: ubuntu-latest
622+
steps:
623+
- name: Checkout cleanup script
624+
uses: actions/checkout@v5
625+
with:
626+
submodules: true
627+
- name: Set up JDK 17
628+
uses: actions/setup-java@v5
629+
with:
630+
distribution: 'temurin'
631+
java-version: 17
632+
cache: 'sbt'
633+
- uses: sbt/setup-sbt@v1
634+
- name: Run Community Build B
635+
run: |
636+
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
637+
638+
639+
community_build_c:
640+
runs-on: ubuntu-latest
641+
steps:
642+
- name: Checkout cleanup script
643+
uses: actions/checkout@v5
644+
with:
645+
submodules: true
646+
- name: Set up JDK 17
647+
uses: actions/setup-java@v5
648+
with:
649+
distribution: 'temurin'
650+
java-version: 17
651+
cache: 'sbt'
652+
- uses: sbt/setup-sbt@v1
653+
- name: Run Community Build C
654+
run: |
655+
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"

‎.gitmodules‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
url = https://github.com/dotty-staging/intent
4040
[submodule "community-build/community-projects/utest"]
4141
path = community-build/community-projects/utest
42-
url = https://github.com/dotty-staging/utest.git
42+
url = https://github.com/dotty-staging/utest-new.git
4343
[submodule "community-build/community-projects/os-lib"]
4444
path = community-build/community-projects/os-lib
4545
url = https://github.com/dotty-staging/os-lib.git
@@ -90,9 +90,9 @@
9090
[submodule "community-build/community-projects/PPrint"]
9191
path = community-build/community-projects/PPrint
9292
url = https://github.com/dotty-staging/PPrint.git
93-
[submodule "community-build/community-projects/requests-scala"]
94-
path = community-build/community-projects/requests-scala
95-
url = https://github.com/dotty-staging/requests-scala.git
93+
[submodule "community-build/community-projects/requests"]
94+
path = community-build/community-projects/requests
95+
url = https://github.com/dotty-staging/requests.git
9696
[submodule "community-build/community-projects/cats-effect-3"]
9797
path = community-build/community-projects/cats-effect-3
9898
url = https://github.com/dotty-staging/cats-effect.git

‎community-build/community-projects/Lucre‎

‎community-build/community-projects/Monocle‎

Submodule Monocle updated 173 files

‎community-build/community-projects/PPrint‎

Submodule PPrint updated 26 files

‎community-build/community-projects/akka‎

‎community-build/community-projects/cask‎

Submodule cask updated 130 files

‎community-build/community-projects/cats‎

‎community-build/community-projects/fansi‎

0 commit comments

Comments
 (0)