Skip to content

Commit

Permalink
Merge pull request #5 from alexarchambault/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
alexarchambault authored Jun 27, 2022
2 parents 67416e8 + 3d673a4 commit dfd8a50
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/launchers.yml
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
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

0 comments on commit dfd8a50

Please sign in to comment.