From 01d8bec2d66412203a50c7edc93dc92a1cc61241 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Sep 2023 09:24:14 +0000 Subject: [PATCH 1/5] 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 2efc4b4..2b7c2fd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") From ac63672d4cf1433fcccafe54bfb2bb2bad732113 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Sep 2023 09:25:08 +0000 Subject: [PATCH 2/5] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93b5e94..2189861 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,41 +27,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 (temurin@8) if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin 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 formatting - run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck + run: sbt '++ ${{ matrix.scala }}' scalafmtCheckAll scalafmtSbtCheck - 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 From f53fd7112cc988d25627092121fa7b13e2149a2a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 14 Sep 2023 04:51:06 +0000 Subject: [PATCH 3/5] Revert commit(s) ac63672, 01d8bec --- .github/workflows/ci.yml | 26 ++++++++++++++++++-------- project/plugins.sbt | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2189861..93b5e94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,31 +27,41 @@ jobs: 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 + uses: actions/setup-java@v2 with: distribution: temurin java-version: 8 - cache: sbt - 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 formatting - run: sbt '++ ${{ matrix.scala }}' scalafmtCheckAll scalafmtSbtCheck + run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck - 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2b7c2fd..2efc4b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") From d213e3ab496f07f1513ab0f86503924336f8f1b4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 14 Sep 2023 04:51:10 +0000 Subject: [PATCH 4/5] 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 62b7d0a..48821e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") From ec35d50a3910174ef68bc249b44c9ae35bc35336 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 14 Sep 2023 04:52:03 +0000 Subject: [PATCH 5/5] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93b5e94..2189861 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,41 +27,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 (temurin@8) if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin 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 formatting - run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck + run: sbt '++ ${{ matrix.scala }}' scalafmtCheckAll scalafmtSbtCheck - 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