From 731f4c7755130cfabb0d60d2413232cdf28c8716 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Dec 2021 07:42:07 +0100 Subject: [PATCH 1/5] Update sbt-github-actions to 0.14.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 13837ec..202d1b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 5fa302e9f556e0c16294c6816d910b85b228ecda Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Dec 2021 07:42:45 +0100 Subject: [PATCH 2/5] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/clean.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90a86d3..33f91f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.11.12, 2.13.6, 2.12.14] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -61,4 +63,4 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_FLAG_NAME: Scala ${{ matrix.scala }} - run: sbt ++${{ matrix.scala }} coverageReport coveralls \ No newline at end of file + run: sbt ++${{ matrix.scala }} coverageReport coveralls diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done \ No newline at end of file + done From 314a3ebe8784bf235e3fac6b36dd15ce6b28d3fc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Mar 2022 02:33:03 +0100 Subject: [PATCH 3/5] Revert commit(s) 5fa302e, 731f4c7 --- .github/workflows/ci.yml | 12 +++++------- .github/workflows/clean.yml | 2 +- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33f91f0..90a86d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.11.12, 2.13.6, 2.12.14] - java: [temurin@11] + java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,12 +31,10 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java and Scala + uses: olafurpg/setup-scala@v12 with: - distribution: temurin - java-version: 11 + java-version: ${{ matrix.java }} - name: Cache sbt uses: actions/cache@v2 @@ -63,4 +61,4 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_FLAG_NAME: Scala ${{ matrix.scala }} - run: sbt ++${{ matrix.scala }} coverageReport coveralls + run: sbt ++${{ matrix.scala }} coverageReport coveralls \ No newline at end of file diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 547aaa4..b535fcc 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done + done \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 202d1b4..13837ec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 0476503982e0dc46bddf9e0edcd03dc30cc7afce Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Mar 2022 02:33:08 +0100 Subject: [PATCH 4/5] Update sbt-github-actions to 0.14.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 13837ec..202d1b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,5 +6,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From c3c420fa9c8c5e07507049abdccd5c8cc8e82218 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Mar 2022 02:33:29 +0100 Subject: [PATCH 5/5] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/clean.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eab0e46..93e9a8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.11.12, 2.13.6, 2.12.14, 3.1.1] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -67,4 +69,4 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_FLAG_NAME: Scala ${{ matrix.scala }} - run: sbt ++${{ matrix.scala }} coverageReport coveralls \ No newline at end of file + run: sbt ++${{ matrix.scala }} coverageReport coveralls diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done \ No newline at end of file + done