back to using sbt-github-actions

FasterXML · Dec 4, 2024 · ae04d9f · ae04d9f
1 parent 812ce2c
commit ae04d9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 132 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,9 +9,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: ['2.*']
+    branches: [2.*]
   push:
-    branches: ['2.*']
+    branches: [2.*]
     tags: [v*]
 
 env:
@@ -64,6 +64,9 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Check that workflows are up to date
+        run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' githubWorkflowCheck
+
       - run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' test mimaReportBinaryIssues
 
       - name: Compress target directories

diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
diff --git a/build.sbt b/build.sbt
@@ -155,9 +155,9 @@ ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G"
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"),
   JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21"))
 ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues")))
+ThisBuild / githubWorkflowTargetBranches := Seq("2.*")
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
 ThisBuild / githubWorkflowPublishTargetBranches := Seq(
-  RefPredicate.Equals(Ref.Branch("master")),
   RefPredicate.StartsWith(Ref.Branch("2.")),
   RefPredicate.StartsWith(Ref.Tag("v"))
 )