8000 Only run CI on JDK 25 and remove specified Scala versions by hugo-vrijswijk · Pull Request #842 · gemini-hlsw/clue · GitHub
[go: up one dir, main page]
Skip to content

Only run CI on JDK 25 and remove specified Scala versions #842

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

Merged
hugo-vrijswijk merged 1 commit into from
Sep 4, 2026
8000
Merged

Only run CI on JDK 25 and remove specified Scala versions #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 14 additions & 43 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
scala: [3.8.4]
java: [temurin@25, temurin@17]
scala: [3]
java: [temurin@25]
project: [rootJS, rootJVM]
exclude:
- project: rootJS
java: temurin@17
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand All @@ -58,19 +55,6 @@ jobs:
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
run: sbt +update

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

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

- name: Check that workflows are up to date
run: sbt githubWorkflowCheck

Expand Down Expand Up @@ -147,35 +131,22 @@ jobs:
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
run: sbt +update

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

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

- name: Download target directories (3.8.4, rootJS)
- name: Download target directories (3, rootJS)
uses: actions/download-artifact@v6
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.8.4-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS

- name: Inflate target directories (3.8.4, rootJS)
- name: Inflate target directories (3, rootJS)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.8.4, rootJVM)
- name: Download target directories (3, rootJVM)
uses: actions/download-artifact@v6
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.8.4-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM

- name: Inflate target directories (3.8.4, rootJVM)
- name: Inflate target directories (3, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -209,21 +180,21 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
java: [temurin@17]
java: [temurin@25]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (fast)
uses: actions/checkout@v6

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@25)
id: setup-java-temurin-25
if: matrix.java == 'temurin@25'
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 25

- uses: coursier/setup-action@v1
- uses: coursier/setup-action@v3
with:
apps: scala-steward

Expand Down
5 changes: 2 additions & 3 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ pull_request_rules:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- 'title=flake.lock: Update'
- status-success=Test (ubuntu-22.04, 3.8.4, temurin@25, rootJS)
- status-success=Test (ubuntu-22.04, 3.8.4, temurin@25, rootJVM)
- status-success=Test (ubuntu-22.04, 3.8.4, temurin@17, rootJVM)
- status-success=Test (ubuntu-22.04, 3, temurin@25, rootJS)
- status-success=Test (ubuntu-22.04, 3, temurin@25, rootJVM)
actions:
merge: {}
- name: Label core PRs
Expand Down
15 changes: 5 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
lazy val V = _root_.scalafix.sbt.BuildInfo

ThisBuild / tlBaseVersion := "0.58"
ThisBuild / tlJdkRelease := Some(17)
ThisBuild / githubWorkflowJavaVersions := Seq("25", "17").map(JavaSpec.temurin(_))
ThisBuild / scalaVersion := "3.8.4"
ThisBuild / crossScalaVersions := Seq("3.8.4")
ThisBuild / githubWorkflowScalaVersions := Seq("3.8.4")
Global / onChangedBuildSource := ReloadOnSourceChanges
ThisBuild / tlBaseVersion := "0.58"
Global / onChangedBuildSource := ReloadOnSourceChanges

// The CI matrix covers Scala 3 only, which builds `sbt-clue` for sbt 2.x. Run the scripted tests
// of the sbt 1.x cross-build (Scala 2.12) in a separate step.
Expand All @@ -29,14 +24,14 @@ ThisBuild / githubWorkflowAddedJobs ~= { jobs =>
"validate-steward",
"Validate Steward Config",
WorkflowStep.Checkout ::
WorkflowStep.SetupJava(List(JavaSpec.temurin("17")), false) :::
WorkflowStep.SetupJava(List(JavaSpec.temurin("25")), false) :::
WorkflowStep.Use(
UseRef.Public("coursier", "setup-action", "v1"),
UseRef.Public("coursier", "setup-action", "v3"),
Map("apps" -> "scala-steward")
) ::
WorkflowStep.Run(List("scala-steward validate-repo-config .scala-steward.conf")) :: Nil,
scalas = List.empty,
javas = List(JavaSpec.temurin("17"))
javas = List(JavaSpec.temurin("25"))
)
else job
}
Expand Down
0