change ci

Author: pjfanning

.github/workflows/ci.yml

@@ -17,42 +17,31 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-concurrency:
-  group: ${{ github.workflow }} @ ${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.11, 2.12, 2.13, 3]
+        scala: [2.11.12, 2.12.18, 2.13.12, 3.3.1]
         java: [zulu@8]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java (zulu@8)
-        id: setup-java-zulu-8
         if: matrix.java == 'zulu@8'
         uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 8
           cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'zulu@8' && steps.setup-java-zulu-8.outputs.cache-hit == 'false'
-        run: sbt +update
-
       - name: Check that workflows are up to date
-        run: sbt githubWorkflowCheck
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
       - name: Scala 2.13 build
         if: startsWith(matrix.scala, '2.13')
@@ -62,19 +51,13 @@ jobs:
         if: '!startsWith(matrix.scala, ''2.13'')'
         run: sbt '++ ${{ matrix.scala }}' test
 
-      - name: Make target directories
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/1.5' || startsWith(github.ref, 'refs/tags/v'))
-        run: mkdir -p target project/target
-
       - name: Compress target directories
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/1.5' || startsWith(github.ref, 'refs/tags/v'))
         run: tar cf targets.tar target project/target
 
       - name: Upload target directories
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/1.5' || startsWith(github.ref, 'refs/tags/v'))
         uses: actions/upload-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
+          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
           path: targets.tar
 
   publish:
@@ -84,6 +67,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        scala: [2.13.12]
         java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -93,54 +77,49 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java (zulu@8)
-        id: setup-java-zulu-8
         if: matrix.java == 'zulu@8'
         uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 8
           cache: sbt
 
-      - name: sbt update
-        if: matrix.java == 'zulu@8' && steps.setup-java-zulu-8.outputs.cache-hit == 'false'
-        run: sbt +update
-
-      - name: Download target directories (2.11)
+      - name: Download target directories (2.11.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.11
+          name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }}
 
-      - name: Inflate target directories (2.11)
+      - name: Inflate target directories (2.11.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12)
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12
+          name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13)
+      - name: Download target directories (2.13.12)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
+          name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13)
+      - name: Inflate target directories (2.13.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3)
+      - name: Download target directories (3.3.1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3
+          name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3)
+      - name: Inflate target directories (3.3.1)
         run: |
           tar xf targets.tar
           rm targets.tar

.github/workflows/clean.yml

@@ -17,6 +17,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Delete artifacts
+        shell: bash {0}
         run: |
           # Customize those three lines with your repository and credentials:
           REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
@@ -25,7 +26,7 @@ jobs:
           ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
 
           # A temporary file which receives HTTP response headers.
-          TMPFILE=/tmp/tmp.$$
+          TMPFILE=$(mktemp)
 
           # An associative array, key: artifact name, value: number of artifacts of that name.
           declare -A ARTCOUNT

build.sbt

@@ -2,7 +2,7 @@
 import xml.Group
 import sbt._
 import Keys._
-import org.typelevel.sbt.gha.JavaSpec.Distribution.Zulu
+import sbtghactions.JavaSpec.Distribution.Zulu
 
 organization := "com.github.swagger-akka-http"
 
@@ -131,14 +131,14 @@ pomExtra := {
 
 MetaInfLicenseCopy.settings
 
-ThisBuild / tlSonatypeUseLegacyHost := true
 ThisBuild / githubWorkflowBuild := Seq(
   WorkflowStep
     .Sbt(List("coverage", "test", "coverageReport"), name = Some("Scala 2.13 build"), cond = Some("startsWith(matrix.scala, '2.13')")),
   WorkflowStep.Sbt(List("test"), name = Some("Scala build"), cond = Some("!startsWith(matrix.scala, '2.13')"))
 )
 
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"))
+ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
 ThisBuild / githubWorkflowPublishTargetBranches := Seq(
   RefPredicate.Equals(Ref.Branch("develop")),
   RefPredicate.Equals(Ref.Branch("1.5")),

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel-sonatype-ci-release" % "0.5.4")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.19.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")