Merge branch 'main' into shorter-job-name

# Conflicts: # .mergify.yml
mzuehlke · Oct 20, 2024 · 83bd2bd · 83bd2bd
2 parents 278d082 + 885eb22
commit 83bd2bd
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,14 +41,14 @@ jobs:
     name: CI
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
         scala: [2.12]
         java:
           - temurin@8
           - temurin@11
           - temurin@17
           - graal_22.3.2@11
-          - graalvm@17
+          - graalvm@21
           - corretto@17
           - semeru@17
         project: [sbt-typelevelJVM]
@@ -63,9 +63,9 @@ jobs:
             os: macos-latest
           - java: graal_22.3.2@11
             os: windows-latest
-          - java: graalvm@17
+          - java: graalvm@21
             os: macos-latest
-          - java: graalvm@17
+          - java: graalvm@21
             os: windows-latest
           - java: corretto@17
             os: macos-latest
@@ -80,9 +80,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Ignore line ending differences in git
         if: contains(runner.os, 'windows')
         shell: bash
@@ -93,6 +90,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -149,17 +149,17 @@ jobs:
         shell: bash
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         shell: bash
         run: sbt +update
 
@@ -196,12 +196,12 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Check scalafix lints
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
 
@@ -210,12 +210,12 @@ jobs:
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         shell: bash
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
@@ -246,14 +246,11 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Ignore line ending differences in git
         if: contains(runner.os, 'windows')
         run: git config --global core.autocrlf false
@@ -263,6 +260,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -315,17 +315,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)
@@ -393,13 +393,10 @@ jobs:
     if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Ignore line ending differences in git
         if: contains(runner.os, 'windows')
         run: git config --global core.autocrlf false
@@ -409,6 +406,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -461,17 +461,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)
@@ -510,7 +510,7 @@ jobs:
     name: Validate Steward Config
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -535,13 +535,10 @@ jobs:
     name: Generate Site
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Ignore line ending differences in git
         if: contains(runner.os, 'windows')
         run: git config --global core.autocrlf false
@@ -551,6 +548,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@8)
         id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
@@ -603,17 +603,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)

diff --git a/.mergify.yml b/.mergify.yml
@@ -12,17 +12,17 @@ pull_request_rules:
   - or:
     - body~=labels:.*early-semver-patch
     - body~=labels:.*early-semver-minor
-  - status-success=CI (ubuntu-latest, 2.12, temurin@8, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
-  - status-success=CI (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM)
-  - status-success=CI (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
-  - status-success=CI (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
-  - status-success=Validate Steward Config (ubuntu-latest, temurin@11)
-  - status-success=Generate Site (ubuntu-latest, temurin@11)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@8, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@11, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, temurin@17, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, graalvm@21, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, corretto@17, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-22.04, 2.12, semeru@17, sbt-typelevelJVM)
+  - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)
+  - status-success=Build and Test (windows-latest, 2.12, temurin@8, sbt-typelevelJVM)
+  - status-success=Validate Steward Config (ubuntu-22.04, temurin@11)
+  - status-success=Generate Site (ubuntu-22.04, temurin@11)
   - '#approved-reviews-by>=1'
   actions:
     merge: {}

diff --git a/build.sbt b/build.sbt
@@ -19,7 +19,7 @@ ThisBuild / githubWorkflowJavaVersions ++= Seq(
   JavaSpec.temurin("11"),
   temurin17,
   JavaSpec(JavaSpec.Distribution.GraalVM("22.3.2"), "11"),
-  JavaSpec.graalvm("17"),
+  JavaSpec.graalvm("21"),
   JavaSpec.corretto("17"),
   JavaSpec.semeru("17")
 )

diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativeKeys.scala
@@ -87,7 +87,7 @@ trait GenerativeKeys {
   lazy val githubWorkflowScalaVersions = settingKey[Seq[String]](
     "A list of Scala versions on which to build the project (default: crossScalaVersions.value)")
   lazy val githubWorkflowOSes =
-    settingKey[Seq[String]]("A list of OS names (default: [ubuntu-latest])")
+    settingKey[Seq[String]]("A list of OS names (default: [ubuntu-22.04])")
 
   lazy val githubWorkflowDependencyPatterns = settingKey[Seq[String]](
     "A list of file globes within the project which affect dependency information (default: [**/*.sbt, project/build.properties])")

diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/GenerativePlugin.scala
@@ -651,7 +651,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
       else
         scalas
     },
-    githubWorkflowOSes := Seq("ubuntu-latest"),
+    githubWorkflowOSes := Seq("ubuntu-22.04"),
     githubWorkflowDependencyPatterns := Seq("**/*.sbt", "project/build.properties"),
     githubWorkflowTargetBranches := Seq("**"),
     githubWorkflowTargetTags := Seq(),
@@ -781,12 +781,6 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
     },
     githubWorkflowGeneratedCacheSteps := Seq(),
     githubWorkflowJobSetup := {
-      val installSbt = List(
-        WorkflowStep.Use(
-          UseRef.Public("sbt", "setup-sbt", "v1"),
-          name = Some("Install sbt")
-        )
-      )
 
       val autoCrlfOpt = if (githubWorkflowOSes.value.exists(_.contains("windows"))) {
         List(
@@ -798,9 +792,9 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
         Nil
       }
 
-      installSbt :::
-        autoCrlfOpt :::
+      autoCrlfOpt :::
         List(WorkflowStep.CheckoutFull) :::
+        WorkflowStep.SetupSbt ::
         WorkflowStep.SetupJava(githubWorkflowJavaVersions.value.toList) :::
         githubWorkflowGeneratedCacheSteps.value.toList
     },

diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowJob.scala
@@ -74,7 +74,7 @@ object WorkflowJob {
       cond: Option[String] = None,
       permissions: Option[Permissions] = None,
       env: Map[String, String] = Map(),
-      oses: List[String] = List("ubuntu-latest"),
+      oses: List[String] = List("ubuntu-22.04"),
       scalas: List[String] = List("2.13"),
       javas: List[JavaSpec] = List(JavaSpec.temurin("11")),
       needs: List[String] = List(),

diff --git a/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala b/github-actions/src/main/scala/org/typelevel/sbt/gha/WorkflowStep.scala
@@ -44,6 +44,11 @@ object WorkflowStep {
     UseRef.Public("actions", "checkout", "v4"),
     name = Some("Checkout current branch (fast)"))
 
+  val SetupSbt: WorkflowStep = WorkflowStep.Use(
+    UseRef.Public("sbt", "setup-sbt", "v1"),
+    name = Some("Setup sbt")
+  )
+
   def SetupJava(versions: List[JavaSpec], enableCaching: Boolean = true): List[WorkflowStep] = {
     def sbtUpdateStep(cond: String, setupId: String) =
       if (enableCaching)