From 91adbed33925faa81688cfb80c545d631d6e7783 Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 6 Sep 2023 00:21:11 +0000 Subject: [PATCH 1/8] 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 aa714d4..beaf448 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") -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.12") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.5") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 9d0e14438e9da7cc6e6e031a40d20fbbde8fa144 Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 6 Sep 2023 00:21:33 +0000 Subject: [PATCH 2/8] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 70 ++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0942a08..7237977 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,48 +24,38 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.11, 3.3.0] - java: [temurin@11, temurin@17] + java: [temurin@8, temurin@17] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - if: matrix.scala == '3.3.0' - run: sbt ++${{ matrix.scala }} coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' coverage test coverageReport coverageAggregate - if: matrix.scala == '2.13.11' - run: sbt ++${{ matrix.scala }} codeVerify coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' codeVerify coverage test coverageReport coverageAggregate - name: Upload coverage to Codecov if: matrix.scala == '2.13.11' @@ -77,7 +67,7 @@ jobs: run: tar cf targets.tar target core/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 @@ -90,42 +80,32 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.0] - java: [temurin@11] + java: [temurin@8] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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.13.11) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }} @@ -135,7 +115,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.0) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }} @@ -149,7 +129,7 @@ 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 - name: Generate documentation if: startsWith(github.ref, 'refs/tags/v') From d060e75819f6a5e363e25d580b0724d1178137b7 Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 20 Sep 2023 00:21:16 +0000 Subject: [PATCH 3/8] Revert commit(s) 9d0e144, 91adbed --- .github/workflows/ci.yml | 70 ++++++++++++++++++++++++++-------------- project/plugins.sbt | 2 +- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7237977..0942a08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,38 +24,48 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.11, 3.3.0] - java: [temurin@8, temurin@17] + java: [temurin@11, temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: distribution: temurin - java-version: 8 - cache: sbt + java-version: 11 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 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: Check that workflows are up to date - run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck + run: sbt ++${{ matrix.scala }} githubWorkflowCheck - if: matrix.scala == '3.3.0' - run: sbt '++ ${{ matrix.scala }}' coverage test coverageReport coverageAggregate + run: sbt ++${{ matrix.scala }} coverage test coverageReport coverageAggregate - if: matrix.scala == '2.13.11' - run: sbt '++ ${{ matrix.scala }}' codeVerify coverage test coverageReport coverageAggregate + run: sbt ++${{ matrix.scala }} codeVerify coverage test coverageReport coverageAggregate - name: Upload coverage to Codecov if: matrix.scala == '2.13.11' @@ -67,7 +77,7 @@ jobs: run: tar cf targets.tar target core/target project/target - name: Upload target directories - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -80,32 +90,42 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.0] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: distribution: temurin - java-version: 8 - cache: sbt + java-version: 11 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 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: Download target directories (2.13.11) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }} @@ -115,7 +135,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.0) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }} @@ -129,7 +149,7 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ci-release + run: sbt ++${{ matrix.scala }} ci-release - name: Generate documentation if: startsWith(github.ref, 'refs/tags/v') diff --git a/project/plugins.sbt b/project/plugins.sbt index beaf448..aa714d4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.5") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 9aab1ff06c6c8baaf65d7752d946ed397b0e741d Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 20 Sep 2023 00:21:18 +0000 Subject: [PATCH 4/8] 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 f6af88a..69232b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") -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.12") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.5") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From e9206840c89a992baa3afcb437ab29e24d4c7d3f Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 20 Sep 2023 00:21:44 +0000 Subject: [PATCH 5/8] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 70 ++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f69f1e..d564631 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,48 +24,38 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.11, 3.3.1] - java: [temurin@11, temurin@17] + java: [temurin@8, temurin@17] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - if: matrix.scala == '3.3.1' - run: sbt ++${{ matrix.scala }} coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' coverage test coverageReport coverageAggregate - if: matrix.scala == '2.13.11' - run: sbt ++${{ matrix.scala }} codeVerify coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' codeVerify coverage test coverageReport coverageAggregate - name: Upload coverage to Codecov if: matrix.scala == '2.13.11' @@ -77,7 +67,7 @@ jobs: run: tar cf targets.tar target core/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 @@ -90,42 +80,32 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.1] - java: [temurin@11] + java: [temurin@8] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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.13.11) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }} @@ -135,7 +115,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.1) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} @@ -149,7 +129,7 @@ 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 - name: Generate documentation if: startsWith(github.ref, 'refs/tags/v') From 14459598873d23e3e2785d68c1dd8387a152c750 Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 27 Sep 2023 00:21:19 +0000 Subject: [PATCH 6/8] Revert commit(s) e920684, 9aab1ff --- .github/workflows/ci.yml | 70 ++++++++++++++++++++++++++-------------- project/plugins.sbt | 2 +- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d564631..3f69f1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,38 +24,48 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.11, 3.3.1] - java: [temurin@8, temurin@17] + java: [temurin@11, temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: distribution: temurin - java-version: 8 - cache: sbt + java-version: 11 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 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: Check that workflows are up to date - run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck + run: sbt ++${{ matrix.scala }} githubWorkflowCheck - if: matrix.scala == '3.3.1' - run: sbt '++ ${{ matrix.scala }}' coverage test coverageReport coverageAggregate + run: sbt ++${{ matrix.scala }} coverage test coverageReport coverageAggregate - if: matrix.scala == '2.13.11' - run: sbt '++ ${{ matrix.scala }}' codeVerify coverage test coverageReport coverageAggregate + run: sbt ++${{ matrix.scala }} codeVerify coverage test coverageReport coverageAggregate - name: Upload coverage to Codecov if: matrix.scala == '2.13.11' @@ -67,7 +77,7 @@ jobs: run: tar cf targets.tar target core/target project/target - name: Upload target directories - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v2 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -80,32 +90,42 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.1] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: distribution: temurin - java-version: 8 - cache: sbt + java-version: 11 - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 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: Download target directories (2.13.11) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }} @@ -115,7 +135,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.1) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v2 with: name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} @@ -129,7 +149,7 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ci-release + run: sbt ++${{ matrix.scala }} ci-release - name: Generate documentation if: startsWith(github.ref, 'refs/tags/v') diff --git a/project/plugins.sbt b/project/plugins.sbt index 69232b3..f6af88a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.5") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 013852701cf6a55f8be2801d7377da74aff39a45 Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 27 Sep 2023 00:21:21 +0000 Subject: [PATCH 7/8] 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 f6af88a..69232b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") -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.12") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.5") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 02eb8858b42baa2790f38145555b98458f4d6c0a Mon Sep 17 00:00:00 2001 From: Fabian Grutsch Date: Wed, 27 Sep 2023 00:21:44 +0000 Subject: [PATCH 8/8] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 70 ++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f82a92..3c22faf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,48 +24,38 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12, 3.3.1] - java: [temurin@11, temurin@17] + java: [temurin@8, temurin@17] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - if: matrix.scala == '3.3.1' - run: sbt ++${{ matrix.scala }} coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' coverage test coverageReport coverageAggregate - if: matrix.scala == '2.13.12' - run: sbt ++${{ matrix.scala }} codeVerify coverage test coverageReport coverageAggregate + run: sbt '++ ${{ matrix.scala }}' codeVerify coverage test coverageReport coverageAggregate - name: Upload coverage to Codecov if: matrix.scala == '2.13.12' @@ -77,7 +67,7 @@ jobs: run: tar cf targets.tar target core/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 @@ -90,42 +80,32 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.1] - java: [temurin@11] + java: [temurin@8] 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@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 + cache: sbt - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 - - - 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.13.12) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} @@ -135,7 +115,7 @@ jobs: rm targets.tar - name: Download target directories (3.3.1) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} @@ -149,7 +129,7 @@ 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 - name: Generate documentation if: startsWith(github.ref, 'refs/tags/v')