Merge branch 'ghik:master' into master

ghik · Oct 11, 2024 · fcaf2bb · fcaf2bb
2 parents 2eb8ea1 + cb6150d
commit fcaf2bb
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 53 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,40 +50,32 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Check that workflows are up to date
-        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
       - name: Build project
-        run: sbt ++${{ matrix.scala }} test
+        run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Compress target directories
         run: tar cf targets.tar target silencer-lib/target silencer-plugin/target project/target
 
       - name: Upload target directories
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
           path: targets.tar
@@ -100,28 +92,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Download target directories (2.13.15)
         uses: actions/download-artifact@v2
@@ -134,7 +118,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.14)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}
 
@@ -144,7 +128,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.13)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }}
 
@@ -154,7 +138,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.12)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }}
 
@@ -164,7 +148,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.11)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}
 
@@ -174,7 +158,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.10)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
 
@@ -184,7 +168,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.9)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.9-${{ matrix.java }}
 
@@ -194,7 +178,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.8)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
 
@@ -204,7 +188,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.7)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }}
 
@@ -214,7 +198,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.6)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
 
@@ -224,7 +208,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.5)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }}
 
@@ -234,7 +218,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.4)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
 
@@ -244,7 +228,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.3)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.3-${{ matrix.java }}
 
@@ -254,7 +238,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13.2)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}
 
@@ -264,7 +248,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.19)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
 
@@ -274,7 +258,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.18)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
 
@@ -284,7 +268,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.17)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
 
@@ -294,7 +278,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.16)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.16-${{ matrix.java }}
 
@@ -304,7 +288,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.15)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
 
@@ -314,7 +298,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.14)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
 
@@ -324,7 +308,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12.13)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
 
@@ -334,7 +318,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.11.12)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }}
 
@@ -348,4 +332,4 @@ jobs:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-        run: sbt ++${{ matrix.scala }} ci-release
+        run: sbt ci-release
diff --git a/.github/workflows/clean.yml b/.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

diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ project/plugins/project/
 .idea/
 local.*
 .bsp
+*.un~
+
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,5 @@ project/plugins/project/ @@
     .idea/
     local.*
     .bsp
+    *.un~