Skip to content

Commit

Permalink
Merge pull request #2646 from vasilmkd/jdk17-25x
Browse files Browse the repository at this point in the history
Use the latest build of JDK 11
  • Loading branch information
mpilquist authored Sep 29, 2021
2 parents 0723256 + 57bedb9 commit 1e4bfb4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ on:
tags: [v*]

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

jobs:
build:
Expand All @@ -27,7 +28,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [3.0.2, 2.12.15, 2.13.6]
java: [adopt@1.11]
java: [adoptium@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -77,7 +78,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
java: [adopt@1.11]
java: [adoptium@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -145,7 +146,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
java: [adopt@1.11]
java: [adoptium@11]
runs-on: ${{ matrix.os }}
steps:
- name: Download target directories (3.0.2)
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ ThisBuild / startYear := Some(2013)
val Scala213 = "2.13.6"
ThisBuild / crossScalaVersions := Seq("3.0.2", "2.12.15", Scala213)

ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]")
ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json")
ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@11")

ThisBuild / spiewakCiReleaseSnapshots := true

Expand Down

0 comments on commit 1e4bfb4

Please sign in to comment.