Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates #5

Merged
merged 5 commits into from
Jun 27, 2022
Merged

Updates #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0968232
Update coursier/setup-action to 1.2.0-M3
alexarchambault Jun 27, 2022
80acd01
Use Java 17 on CI
alexarchambault Jun 27, 2022
6cd6126
Update scala-js-cli to 1.1.1-sc5
alexarchambault Jun 27, 2022
0d5900f
Add Scala.js 1.10.1 support
alexarchambault Jun 27, 2022
3d673a4
Update GraalVM to 22.1.0
alexarchambault Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/launchers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
scalaJsVersion: ["1.9.0", "1.10.0"]
scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- uses: coursier/[email protected]
- uses: coursier/setup-action@v1
- uses: coursier/setup-action@v1.2.0-M3
with:
jvm: 8
jvm: temurin:17
- run: |
./mill -i "native[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
./generate.sh && \
Expand Down Expand Up @@ -54,16 +54,16 @@ jobs:
strategy:
fail-fast: false
matrix:
scalaJsVersion: ["1.9.0", "1.10.0"]
scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- uses: coursier/[email protected]
- uses: coursier/setup-action@v1
- uses: coursier/setup-action@v1.2.0-M3
with:
jvm: 8
jvm: temurin:17
- run: |
./mill -i "native-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
./generate.sh && \
Expand All @@ -86,16 +86,16 @@ jobs:
strategy:
fail-fast: false
matrix:
scalaJsVersion: ["1.9.0", "1.10.0"]
scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- uses: coursier/[email protected]
- uses: coursier/setup-action@v1
- uses: coursier/setup-action@v1.2.0-M3
with:
jvm: 8
jvm: temurin:17
- run: |
./mill -i "native-mostly-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \
./generate.sh && \
Expand Down
6 changes: 3 additions & 3 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import mill._
import mill.scalalib._
import coursier.core.Version

def scalaJsCliVersion = "1.1.1-sc4.1"
def scalaJsVersions = Seq("1.9.0", "1.10.0")
def scalaJsCliVersion = "1.1.1-sc5"
def scalaJsVersions = Seq("1.9.0", "1.10.0", "1.10.1")

class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule with NativeImage {
def scalaVersion = "2.13.8"
Expand All @@ -35,7 +35,7 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit
)
}
def nativeImagePersist = System.getenv("CI") != null
def graalVmVersion = "22.0.0"
def graalVmVersion = "22.1.0"
def nativeImageGraalVmJvmId = s"graalvm-java17:$graalVmVersion"
def nativeImageName = "scala-js-ld"
def ivyDeps = super.ivyDeps() ++ Seq(
Expand Down