Skip to content

Commit

Permalink
Merge pull request typelevel#2218 from vasilmkd/custom-jabba-index
Browse files Browse the repository at this point in the history
Use a custom jabba index
  • Loading branch information
djspiewak authored Aug 14, 2021
2 parents 0b42684 + 8a55896 commit 203e25c
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
35 changes: 18 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JABBA_INDEX: 'https://github.com/vasilmkd/jdk-index/raw/main/index.json'

jobs:
build:
Expand All @@ -24,61 +25,61 @@ jobs:
os: [ubuntu-latest, windows-latest]
scala: [3.0.1, 2.12.14, 2.13.6]
java:
- adopt@1.8
- adopt@1.11
- adopt@1.16
- graalvm-ce-java8@21.1
- adoptium@8
- adoptium@11
- adoptium@16
- graalvm-ce-java8@21.2
ci: [ciJVM, ciJS, ciFirefox, ciChrome, ciJSDOMNodeJS]
exclude:
- ci: ciJS
java: adopt@1.11
java: adoptium@11
- ci: ciJS
java: adopt@1.16
java: adoptium@16
- ci: ciJS
java: graalvm-ce-java8@21.1
java: graalvm-ce-java8@21.2
- os: windows-latest
scala: 3.0.1
- os: windows-latest
scala: 2.12.14
- os: windows-latest
ci: ciJS
- ci: ciFirefox
java: adopt@1.11
java: adoptium@11
- ci: ciFirefox
java: adopt@1.16
java: adoptium@16
- ci: ciFirefox
java: graalvm-ce-java8@21.1
java: graalvm-ce-java8@21.2
- os: windows-latest
scala: 3.0.1
- os: windows-latest
scala: 2.12.14
- os: windows-latest
ci: ciFirefox
- ci: ciChrome
java: adopt@1.11
java: adoptium@11
- ci: ciChrome
java: adopt@1.16
java: adoptium@16
- ci: ciChrome
java: graalvm-ce-java8@21.1
java: graalvm-ce-java8@21.2
- os: windows-latest
scala: 3.0.1
- os: windows-latest
scala: 2.12.14
- os: windows-latest
ci: ciChrome
- ci: ciJSDOMNodeJS
java: adopt@1.11
java: adoptium@11
- ci: ciJSDOMNodeJS
java: adopt@1.16
java: adoptium@16
- ci: ciJSDOMNodeJS
java: graalvm-ce-java8@21.1
java: graalvm-ce-java8@21.2
- os: windows-latest
scala: 3.0.1
- os: windows-latest
scala: 2.12.14
- os: windows-latest
ci: ciJSDOMNodeJS
- java: adopt@1.16
- java: adoptium@16
os: windows-latest
runs-on: ${{ matrix.os }}
steps:
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ThisBuild / developers := List(
val PrimaryOS = "ubuntu-latest"
val Windows = "windows-latest"

val ScalaJSJava = "adopt@1.8"
val ScalaJSJava = "adoptium@8"
val Scala213 = "2.13.6"
val Scala3 = "3.0.1"

Expand All @@ -60,11 +60,12 @@ ThisBuild / crossScalaVersions := Seq(Scala3, "2.12.14", Scala213)
ThisBuild / githubWorkflowUseSbtThinClient := false
ThisBuild / githubWorkflowTargetBranches := Seq("series/3.x")

val LTSJava = "adopt@1.11"
val LatestJava = "adopt@1.16"
val GraalVM8 = "graalvm-ce-java8@21.1"
val LTSJava = "adoptium@11"
val LatestJava = "adoptium@16"
val GraalVM8 = "graalvm-ce-java8@21.2"

ThisBuild / githubWorkflowJavaVersions := Seq(ScalaJSJava, LTSJava, LatestJava, GraalVM8)
ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/vasilmkd/jdk-index/raw/main/index.json")
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, Windows)

ThisBuild / githubWorkflowBuildPreamble ++= Seq(
Expand Down

0 comments on commit 203e25c

Please sign in to comment.