From 753265073de994e6923747f366877bf66876a06d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 25 Jun 2024 02:53:17 +0000 Subject: [PATCH 1/2] Update sbt-github-actions to 0.24.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 87caae2..9ece02a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0") From 75cafd7828fc8e3c354c149bc89a48fbc0e98eee Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 25 Jun 2024 02:53:57 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 58 ++++++++++++++----------------------- .github/workflows/clean.yml | 3 +- 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2633a5..380c474 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,49 +28,42 @@ 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 (adopt-hotspot@8) if: matrix.java == 'adopt-hotspot@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt-hotspot java-version: 8 + cache: sbt - name: Setup Java (adopt-hotspot@11) if: matrix.java == 'adopt-hotspot@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt-hotspot java-version: 11 + 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 - - run: sbt ++${{ matrix.scala }} scalafmtCheckAll + - run: sbt '++ ${{ matrix.scala }}' scalafmtCheckAll - 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 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 @@ -87,38 +80,31 @@ 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 (adopt-hotspot@8) if: matrix.java == 'adopt-hotspot@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt-hotspot java-version: 8 + cache: sbt - name: Setup Java (adopt-hotspot@11) if: matrix.java == 'adopt-hotspot@11' - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: adopt-hotspot java-version: 11 + 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.11.12) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }} @@ -128,7 +114,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 }} @@ -138,7 +124,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 }} @@ -152,4 +138,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 index 547aaa4..bfc865d 100644 --- 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