Skip to content

Commit

Permalink
Fixed java version names
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-mie6
j-mie6 committed Dec 19, 2022
1 parent 6f82986 commit 822538d
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 57 deletions.
112 changes: 56 additions & 56 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,71 +29,71 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.10, 2.12.15, 3.1.2]
java: [temurin@1.8, temurin@1.11, temurin@1.17]
java: [temurin@8, temurin@11, temurin@17]
project: [rootJS, rootJVM, rootNative]
exclude:
- project: rootJS
java: temurin@1.11
java: temurin@11
- project: rootJS
java: temurin@1.17
java: temurin@17
- project: rootNative
java: temurin@1.11
java: temurin@11
- project: rootNative
java: temurin@1.17
java: temurin@17
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Download Java (temurin@1.8)
id: download-java-temurin-1.8
if: matrix.java == 'temurin@1.8'
- name: Download Java (temurin@8)
id: download-java-temurin-8
if: matrix.java == 'temurin@8'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.8
java-version: 8

- name: Setup Java (temurin@1.8)
if: matrix.java == 'temurin@1.8'
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.8
jdkFile: ${{ steps.download-java-temurin-1.8.outputs.jdkFile }}
java-version: 8
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}

- name: Download Java (temurin@1.11)
id: download-java-temurin-1.11
if: matrix.java == 'temurin@1.11'
- name: Download Java (temurin@11)
id: download-java-temurin-11
if: matrix.java == 'temurin@11'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.11
java-version: 11

- name: Setup Java (temurin@1.11)
if: matrix.java == 'temurin@1.11'
- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.11
jdkFile: ${{ steps.download-java-temurin-1.11.outputs.jdkFile }}
java-version: 11
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}

- name: Download Java (temurin@1.17)
id: download-java-temurin-1.17
if: matrix.java == 'temurin@1.17'
- name: Download Java (temurin@17)
id: download-java-temurin-17
if: matrix.java == 'temurin@17'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.17
java-version: 17

- name: Setup Java (temurin@1.17)
if: matrix.java == 'temurin@1.17'
- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.17
jdkFile: ${{ steps.download-java-temurin-1.17.outputs.jdkFile }}
java-version: 17
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -122,11 +122,11 @@ jobs:
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test

- name: Check binary compatibility
if: matrix.java == 'temurin@1.8'
if: matrix.java == 'temurin@8'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
if: matrix.java == 'temurin@1.8'
if: matrix.java == 'temurin@8'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc

- name: Make target directories
Expand All @@ -152,61 +152,61 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
java: [temurin@1.8]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Download Java (temurin@1.8)
id: download-java-temurin-1.8
if: matrix.java == 'temurin@1.8'
- name: Download Java (temurin@8)
id: download-java-temurin-8
if: matrix.java == 'temurin@8'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.8
java-version: 8

- name: Setup Java (temurin@1.8)
if: matrix.java == 'temurin@1.8'
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.8
jdkFile: ${{ steps.download-java-temurin-1.8.outputs.jdkFile }}
java-version: 8
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}

- name: Download Java (temurin@1.11)
id: download-java-temurin-1.11
if: matrix.java == 'temurin@1.11'
- name: Download Java (temurin@11)
id: download-java-temurin-11
if: matrix.java == 'temurin@11'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.11
java-version: 11

- name: Setup Java (temurin@1.11)
if: matrix.java == 'temurin@1.11'
- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.11
jdkFile: ${{ steps.download-java-temurin-1.11.outputs.jdkFile }}
java-version: 11
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}

- name: Download Java (temurin@1.17)
id: download-java-temurin-1.17
if: matrix.java == 'temurin@1.17'
- name: Download Java (temurin@17)
id: download-java-temurin-17
if: matrix.java == 'temurin@17'
uses: typelevel/download-java@v1
with:
distribution: temurin
java-version: 1.17
java-version: 17

- name: Setup Java (temurin@1.17)
if: matrix.java == 'temurin@1.17'
- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: jdkfile
java-version: 1.17
jdkFile: ${{ steps.download-java-temurin-1.17.outputs.jdkFile }}
java-version: 17
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v2
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ val Scala213 = "2.13.10"
val Scala212 = "2.12.15"
val Scala3 = "3.1.2"

Global / onChangedBuildSource := ReloadOnSourceChanges

inThisBuild(List(
tlBaseVersion := "0.1",
organization := "com.github.j-mie6",
Expand All @@ -18,7 +20,7 @@ inThisBuild(List(
scalaVersion := Scala213,
// CI Configuration
tlCiReleaseBranches := Seq("master"),
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("1.8"), JavaSpec.temurin("1.11"), JavaSpec.temurin("1.17")),
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17")),
))

lazy val root = tlCrossRootProject.aggregate(core)
Expand Down

0 comments on commit 822538d

Please sign in to comment.