Skip to content

Commit 3cc3113

Browse files
authored
Merge branch 'main' into scala-Tuple-mapKind
2 parents 843e4f1 + 714f3b6 commit 3cc3113

File tree

560 files changed

+6189
-3791
lines changed

Some content is hidden

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

560 files changed

+6189
-3791
lines changed

.github/workflows/build-chocolatey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Build the Chocolatey package (.nupkg)
5050
run: choco pack ./pkgs/chocolatey/scala.nuspec --out ./pkgs/chocolatey
5151
- name: Upload the Chocolatey package to GitHub
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
with:
5454
name: scala.nupkg
5555
path: ./pkgs/chocolatey/scala.${{ inputs.version }}.nupkg

.github/workflows/build-msi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
env:
3333
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3434
- name: Upload MSI Artifact
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: scala.msi
3838
path: ./dist/win-x86_64/target/windows/scala.msi

.github/workflows/build-sdk.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,37 +75,37 @@ jobs:
7575
- name: Build and pack the SDK (win x86-64)
7676
run : ./project/scripts/sbt dist-win-x86_64/Universal/stage
7777
- name: Upload zip archive to GitHub Artifact (universal)
78-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v5
7979
id : universal
8080
with:
8181
path: ./dist/target/universal/stage
8282
name: scala3-universal
8383
- name: Upload zip archive to GitHub Artifact (linux x86-64)
84-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v5
8585
id : linux-x86_64
8686
with:
8787
path: ./dist/linux-x86_64/target/universal/stage
8888
name: scala3-x86_64-pc-linux
8989
- name: Upload zip archive to GitHub Artifact (linux aarch64)
90-
uses: actions/upload-artifact@v4
90+
uses: actions/upload-artifact@v5
9191
id : linux-aarch64
9292
with:
9393
path: ./dist/linux-aarch64/target/universal/stage
9494
name: scala3-aarch64-pc-linux
9595
- name: Upload zip archive to GitHub Artifact (mac x86-64)
96-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v5
9797
id : mac-x86_64
9898
with:
9999
path: ./dist/mac-x86_64/target/universal/stage
100100
name: scala3-x86_64-apple-darwin
101101
- name: Upload zip archive to GitHub Artifact (mac aarch64)
102-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@v5
103103
id : mac-aarch64
104104
with:
105105
path: ./dist/mac-aarch64/target/universal/stage
106106
name: scala3-aarch64-apple-darwin
107107
- name: Upload zip archive to GitHub Artifact (win x86-64)
108-
uses: actions/upload-artifact@v4
108+
uses: actions/upload-artifact@v5
109109
id : win-x86_64
110110
with:
111111
path: ./dist/win-x86_64/target/universal/stage

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ jobs:
425425
prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/"
426426
427427
- name: Download MSI package
428-
uses: actions/download-artifact@v5
428+
uses: actions/download-artifact@v6
429429
with:
430430
name: scala.msi
431431
path: .

.github/workflows/publish-chocolatey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: windows-latest
3232
steps:
3333
- name: Fetch the Chocolatey package from GitHub
34-
uses: actions/download-artifact@v5
34+
uses: actions/download-artifact@v6
3535
with:
3636
name: scala.nupkg
3737
- name: Publish the package to Chocolatey

.github/workflows/stdlib.yaml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ permissions:
1010
contents: read
1111

1212
env:
13+
DOTTY_CI_RUN: true
1314
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1415

1516
jobs:
@@ -279,6 +280,24 @@ jobs:
279280
- name: Compile `scala3-library` for Scala.js
280281
run: ./project/scripts/sbt scala3-library-sjs/compile
281282

283+
repl:
284+
runs-on: ubuntu-latest
285+
needs: [scala3-compiler-bootstrapped]
286+
steps:
287+
- name: Git Checkout
288+
uses: actions/checkout@v5
289+
290+
- name: Set up JDK 17
291+
uses: actions/setup-java@v5
292+
with:
293+
distribution: 'temurin'
294+
java-version: 17
295+
cache: 'sbt'
296+
- uses: sbt/setup-sbt@v1
297+
298+
- name: Compile REPL
299+
run: ./project/scripts/sbt scala3-repl/compile
300+
282301
scaladoc:
283302
runs-on: ubuntu-latest
284303
needs: [scala3-compiler-bootstrapped, scala3-tasty-inspector]
@@ -531,7 +550,7 @@ jobs:
531550
distribution: 'temurin'
532551
java-version: 17
533552
cache: 'sbt'
534-
- uses: actions/setup-node@v5
553+
- uses: actions/setup-node@v6
535554
with:
536555
node-version: '24.x'
537556
- uses: sbt/setup-sbt@v1
@@ -547,6 +566,23 @@ jobs:
547566
run: ./project/scripts/sbt ";sjsJUnitTests/clean ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToLatestESVersion ;set Global/enableWebAssembly := true; sjsJUnitTests/test"
548567
# TODO Scala.js on Windows
549568

569+
test-repl:
570+
runs-on: ubuntu-latest
571+
needs: [repl]
572+
steps:
573+
- name: Git Checkout
574+
uses: actions/checkout@v5
575+
576+
- name: Set up JDK 17
577+
uses: actions/setup-java@v5
578+
with:
579+
distribution: 'temurin'
580+
java-version: 17
581+
cache: 'sbt'
582+
- uses: sbt/setup-sbt@v1
583+
- name: Test REPL
584+
run: ./project/scripts/sbt scala3-repl/test
585+
550586
scripted-tests:
551587
runs-on: ubuntu-latest
552588
needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]

.github/workflows/test-chocolatey.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
distribution: temurin
3636
java-version: ${{ inputs.java-version }}
3737
- name: Download the 'nupkg' from GitHub Artifacts
38-
uses: actions/download-artifact@v5
38+
uses: actions/download-artifact@v6
3939
with:
4040
name: scala.nupkg
4141
path: ${{ env.CHOCOLATEY-REPOSITORY }}

.github/workflows/test-msi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
distribution: temurin
3030
java-version: ${{ inputs.java-version }}
3131
- name: Download MSI artifact
32-
uses: actions/download-artifact@v5
32+
uses: actions/download-artifact@v6
3333
with:
3434
name: scala.msi
3535
path: .

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ testlogs/
6161
/.cache-tests
6262

6363
# Put local stuff here
64-
local/
64+
/local/
6565

6666
/bin/.cp
6767

bin/scalaQ

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)