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.

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

use graalvm 21 #416

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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