Skip to content

Commit

Permalink
use graalvm 21
Browse files Browse the repository at this point in the history
  • Loading branch information
Patryk Kowalcze committed Oct 13, 2023
1 parent f24bd17 commit e853b50
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,29 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.12]
java: [graalvm@20]
java: [graalvm@21]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Download Java (graalvm@20)
id: download-java-graalvm-20
if: matrix.java == 'graalvm@20'
- name: Download Java (graalvm@21)
id: download-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: typelevel/download-java@v2
with:
distribution: graalvm
java-version: 20
java-version: 21

- name: Setup Java (graalvm@20)
if: matrix.java == 'graalvm@20'
- name: Setup Java (graalvm@21)
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v3
with:
distribution: jdkfile
java-version: 20
jdkFile: ${{ steps.download-java-graalvm-20.outputs.jdkFile }}
java-version: 21
jdkFile: ${{ steps.download-java-graalvm-21.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v3
Expand All @@ -69,18 +69,18 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check headers and formatting
if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck

- name: Test
run: sbt '++ ${{ matrix.scala }}' test

- name: Check binary compatibility
if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
run: sbt '++ ${{ matrix.scala }}' doc

- name: Integration tests
Expand Down Expand Up @@ -108,29 +108,29 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
java: [graalvm@20]
java: [graalvm@21]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Download Java (graalvm@20)
id: download-java-graalvm-20
if: matrix.java == 'graalvm@20'
- name: Download Java (graalvm@21)
id: download-java-graalvm-21
if: matrix.java == 'graalvm@21'
uses: typelevel/download-java@v2
with:
distribution: graalvm
java-version: 20
java-version: 21

- name: Setup Java (graalvm@20)
if: matrix.java == 'graalvm@20'
- name: Setup Java (graalvm@21)
if: matrix.java == 'graalvm@21'
uses: actions/setup-java@v3
with:
distribution: jdkfile
java-version: 20
jdkFile: ${{ steps.download-java-graalvm-20.outputs.jdkFile }}
java-version: 21
jdkFile: ${{ steps.download-java-graalvm-21.outputs.jdkFile }}

- name: Cache sbt
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ThisBuild / versionScheme := Some("early-semver")
ThisBuild / homepage := Some(url("https://github.com/ocadotechnology/sttp-oauth2"))
val Scala213 = "2.13.12"
ThisBuild / scalaVersion := Scala213
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("20"))
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("21"))
ThisBuild / githubWorkflowBuild ++= Seq(
WorkflowStep.Sbt(
commands = List("IntegrationTest/test"),
Expand Down

0 comments on commit e853b50

Please sign in to comment.