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

Update sbt-github-actions to 0.14.0 #4064

Merged
merged 5 commits into from
Dec 2, 2021
Merged

Update sbt-github-actions to 0.14.0 #4064

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
4efa8e9
Update sbt-github-actions to 0.14.0
scala-steward Dec 1, 2021
2afdd42
Updated JVM specification syntax
djspiewak Dec 1, 2021
c71c1ff
GraalVM 8 is no longer supported
djspiewak Dec 1, 2021
c1fa210
Typos are bad
djspiewak Dec 1, 2021
099d3ef
Updated graalvm specifications
djspiewak Dec 2, 2021
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
107 changes: 84 additions & 23 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,17 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.7, 3.0.2]
java:
- adoptium@8
- adoptium@17
- graalvm-ce-java8@21.2
java: [temurin@8, temurin@17, graal_20.3.1@11]
platform: [jvm, js, native]
exclude:
- platform: js
java: adoptium@17
java: temurin@17
- platform: native
java: adoptium@17
java: temurin@17
- platform: js
java: graalvm-ce-java8@21.2
java: graal_20.3.1@11
- platform: native
java: graalvm-ce-java8@21.2
java: graal_20.3.1@11
- platform: native
scala: 3.0.2
runs-on: ${{ matrix.os }}
Expand All @@ -47,10 +44,26 @@ jobs:
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: temurin
java-version: 8

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 17

- name: Setup GraalVM (graal_20.3.1@11)
if: matrix.java == 'graal_20.3.1@11'
uses: DeLaGuardo/setup-graalvm@5.0
with:
graalvm: 20.3.1
java: java11

- name: Cache sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -113,18 +126,34 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.7, 3.0.2]
java: [adoptium@8]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 17

- name: Setup GraalVM (graal_20.3.1@11)
if: matrix.java == 'graal_20.3.1@11'
uses: DeLaGuardo/setup-graalvm@5.0
with:
java-version: ${{ matrix.java }}
graalvm: 20.3.1
java: java11

- name: Cache sbt
uses: actions/cache@v2
Expand All @@ -149,18 +178,34 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.7, 3.0.2]
java: [adoptium@8]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: temurin
java-version: 8

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 17

- name: Setup GraalVM (graal_20.3.1@11)
if: matrix.java == 'graal_20.3.1@11'
uses: DeLaGuardo/setup-graalvm@5.0
with:
graalvm: 20.3.1
java: java11

- name: Cache sbt
uses: actions/cache@v2
Expand All @@ -184,18 +229,34 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15]
java: [adoptium@8]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 17

- name: Setup GraalVM (graal_20.3.1@11)
if: matrix.java == 'graal_20.3.1@11'
uses: DeLaGuardo/setup-graalvm@5.0
with:
java-version: ${{ matrix.java }}
graalvm: 20.3.1
java: java11

- name: Cache sbt
uses: actions/cache@v2
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ val PrimaryOS = "ubuntu-latest"
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS)
ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json")

val PrimaryJava = "adoptium@8"
val LTSJava = "adoptium@17"
val GraalVM8 = "graalvm-ce-java8@21.2"
val PrimaryJava = JavaSpec.temurin("8")
val LTSJava = JavaSpec.temurin("17")
val GraalVM11 = JavaSpec.graalvm("20.3.1", "11")

ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM8)
ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM11)

val Scala212 = "2.12.15"
val Scala213 = "2.13.7"
Expand All @@ -52,8 +52,8 @@ ThisBuild / githubWorkflowBuildMatrixAdditions +=

ThisBuild / githubWorkflowBuildMatrixExclusions ++=
githubWorkflowJavaVersions.value.filterNot(Set(PrimaryJava)).flatMap { java =>
Seq(MatrixExclude(Map("platform" -> "js", "java" -> java)),
MatrixExclude(Map("platform" -> "native", "java" -> java))
Seq(MatrixExclude(Map("platform" -> "js", "java" -> java.render)),
MatrixExclude(Map("platform" -> "native", "java" -> java.render))
)
}

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")

/* Temporarily disabling sbt-hydra, see #2870.
resolvers += Resolver.url(
Expand Down