From e147faf3cfe3d8a0c4951af39bcac86fa29dd856 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Sep 2023 06:29:16 +0000 Subject: [PATCH 1/2] Update sbt-github-actions to 0.16.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 87caae2..164e212 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.16.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0") From 32e569d95c9d81fa61f62c9715940445787ff120 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Sep 2023 06:30:04 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 56 +++++++++++++--------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2633a5..bc1c575 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,49 +28,39 @@ 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@v3 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@v3 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') }} - - - 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@v3 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -87,38 +77,28 @@ 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@v3 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@v3 with: distribution: adopt-hotspot java-version: 11 - - - 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') }} + cache: sbt - name: Download target directories (2.11.12) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }} @@ -128,7 +108,7 @@ jobs: rm targets.tar - name: Download target directories (2.12.15) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} @@ -138,7 +118,7 @@ jobs: rm targets.tar - name: Download target directories (2.13.8) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} @@ -152,4 +132,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