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.

Sign up for GitHub

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

fix GHA problems #558

Merged
merged 3 commits into from
Jun 23, 2023
Merged

fix GHA problems #558

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63259b4
fix GHA:
mzuehlke Jun 23, 2023
fd0a7ce
Add old GraalVM and OpenJ9 to CI
armanbilge Jun 23, 2023
eba6bd9
Merge branch 'main' into fix_java-setup
armanbilge Jun 23, 2023
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
116 changes: 116 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ jobs:
- temurin@8
- temurin@11
- temurin@17
- graal_22.3.2@11
- graalvm@17
- corretto@17
- adopt-openj9@17
project: [sbt-typelevelJVM]
exclude:
- java: temurin@11
Expand All @@ -45,6 +47,10 @@ jobs:
os: macos-latest
- java: temurin@17
os: windows-latest
- java: graal_22.3.2@11
os: macos-latest
- java: graal_22.3.2@11
os: windows-latest
- java: graalvm@17
os: macos-latest
- java: graalvm@17
Expand All @@ -53,6 +59,10 @@ jobs:
os: macos-latest
- java: corretto@17
os: windows-latest
- java: adopt-openj9@17
os: macos-latest
- java: adopt-openj9@17
os: windows-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -108,6 +118,20 @@ jobs:
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update

- name: Setup GraalVM (graal_22.3.2@11)
id: setup-graalvm-22_3_2-11
if: matrix.java == 'graal_22.3.2@11'
uses: graalvm/setup-graalvm@v1
with:
version: 22.3.2
java-version: 11
cache: sbt

- name: sbt update
if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
Expand Down Expand Up @@ -136,6 +160,20 @@ jobs:
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update

- name: Setup Java (adopt-openj9@17)
id: setup-java-adopt-openj9-17
if: matrix.java == 'adopt-openj9@17'
uses: actions/setup-java@v3
with:
distribution: adopt-openj9
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'adopt-openj9@17' && steps.setup-java-adopt-openj9-17.outputs.cache-hit == 'false'
shell: bash
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update

- name: Check that workflows are up to date
shell: bash
run: sbt githubWorkflowCheck
Expand Down Expand Up @@ -240,6 +278,19 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup GraalVM (graal_22.3.2@11)
id: setup-graalvm-22_3_2-11
if: matrix.java == 'graal_22.3.2@11'
uses: graalvm/setup-graalvm@v1
with:
version: 22.3.2
java-version: 11
cache: sbt

- name: sbt update
if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
Expand All @@ -266,6 +317,19 @@ jobs:
if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup Java (adopt-openj9@17)
id: setup-java-adopt-openj9-17
if: matrix.java == 'adopt-openj9@17'
uses: actions/setup-java@v3
with:
distribution: adopt-openj9
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'adopt-openj9@17' && steps.setup-java-adopt-openj9-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Download target directories (2.12, sbt-typelevelJVM)
uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -357,6 +421,19 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update

- name: Setup GraalVM (graal_22.3.2@11)
id: setup-graalvm-22_3_2-11
if: matrix.java == 'graal_22.3.2@11'
uses: graalvm/setup-graalvm@v1
with:
version: 22.3.2
java-version: 11
cache: sbt

- name: sbt update
if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
Expand All @@ -383,6 +460,19 @@ jobs:
if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update

- name: Setup Java (adopt-openj9@17)
id: setup-java-adopt-openj9-17
if: matrix.java == 'adopt-openj9@17'
uses: actions/setup-java@v3
with:
distribution: adopt-openj9
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'adopt-openj9@17' && steps.setup-java-adopt-openj9-17.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update

- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
Expand Down Expand Up @@ -461,6 +551,19 @@ jobs:
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup GraalVM (graal_22.3.2@11)
id: setup-graalvm-22_3_2-11
if: matrix.java == 'graal_22.3.2@11'
uses: graalvm/setup-graalvm@v1
with:
version: 22.3.2
java-version: 11
cache: sbt

- name: sbt update
if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup Java (graalvm@17)
id: setup-java-graalvm-17
if: matrix.java == 'graalvm@17'
Expand All @@ -487,6 +590,19 @@ jobs:
if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Setup Java (adopt-openj9@17)
id: setup-java-adopt-openj9-17
if: matrix.java == 'adopt-openj9@17'
uses: actions/setup-java@v3
with:
distribution: adopt-openj9
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'adopt-openj9@17' && steps.setup-java-adopt-openj9-17.outputs.cache-hit == 'false'
run: sbt reload +update

- name: Generate site
run: sbt docs/tlSite

Expand Down
2 changes: 2 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ pull_request_rules:
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, adopt-openj9@17, sbt-typelevelJVM)
- status-success=Build and Test (macos-latest, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
- status-success=Validate Steward Config (ubuntu-latest)
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ ThisBuild / startYear := Some(2022)
ThisBuild / githubWorkflowJavaVersions ++= Seq(
JavaSpec.temurin("11"),
JavaSpec.temurin("17"),
JavaSpec(JavaSpec.Distribution.GraalVM("22.3.2"), "11"),
JavaSpec.graalvm("17"),
JavaSpec.corretto("17")
JavaSpec.corretto("17"),
JavaSpec.openj9("17")
)

ThisBuild / githubWorkflowOSes ++= Seq("macos-latest", "windows-latest")
Expand Down
2 changes: 1 addition & 1 deletion github-actions/src/main/scala/org/typelevel/sbt/gha/JavaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object JavaSpec {
object Distribution {
case object Temurin extends Distribution("temurin")
case object Corretto extends Distribution("corretto")
case object OpenJ9 extends Distribution("openj9")
case object OpenJ9 extends Distribution("adopt-openj9")
case object Oracle extends Distribution("oracle")
case object Zulu extends Distribution("zulu")
case object Liberica extends Distribution("liberica")
Expand Down
4 changes: 2 additions & 2 deletions github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object WorkflowStep {

versions flatMap {
case jv @ JavaSpec(JavaSpec.Distribution.GraalVM(graalVersion), javaVersion) =>
val setupId = s"setup-graalvm-${graalVersion}-$javaVersion"
val setupId = s"setup-graalvm-${graalVersion}-$javaVersion".replace('.', '_')
val cond = s"matrix.java == '${jv.render}'"
WorkflowStep.Use(
SetupGraalVMAction,
Expand All @@ -66,7 +66,7 @@ object WorkflowStep {
) :: sbtUpdateStep(cond, setupId) :: Nil

case jv @ JavaSpec(dist, version) =>
val setupId = s"setup-java-${dist.rendering}-$version"
val setupId = s"setup-java-${dist.rendering}-$version".replace('.', '_')
val cond = s"matrix.java == '${jv.render}'"

WorkflowStep.Use(
Expand Down