From 58c95355502870dfc79fa10e7230717229c5d306 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 13:31:59 +0200 Subject: [PATCH 1/3] Update sbt-github-actions to 0.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 87998fc..36ef34d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") //addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.2") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.2.1") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") From 5f6e2f3afac898cb4f9272bc5b2a7c83298f7fe5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 2 Jun 2021 13:32:24 +0200 Subject: [PATCH 2/3] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99f05b4..0dc3a62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['*'] + branches: ['**'] push: - branches: ['*'] + branches: ['**'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.13, 2.13.5] - java: [adopt@1.11] + java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v12 with: java-version: ${{ matrix.java }} @@ -49,7 +49,7 @@ jobs: 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 --client '++${{ matrix.scala }}; githubWorkflowCheck' - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -62,10 +62,10 @@ jobs: gem install jekyll -v 4.0.0 - name: Test - run: sbt ++${{ matrix.scala }} clean coverage + run: sbt --client '++${{ matrix.scala }}; clean; coverage' - name: Coverage - run: sbt ++${{ matrix.scala }} coverageReport + run: sbt --client '++${{ matrix.scala }}; coverageReport' - uses: codecov/codecov-action@v1 @@ -86,7 +86,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.13] - java: [adopt@1.11] + java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -95,7 +95,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v12 with: java-version: ${{ matrix.java }} @@ -132,4 +132,4 @@ jobs: rm targets.tar - name: Publish project - run: sbt ++${{ matrix.scala }} +publish \ No newline at end of file + run: sbt --client '++${{ matrix.scala }}; +publish' \ No newline at end of file From b76fa355f1f09ef6b94b7cdce10bc59683fdb6b5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 3 Jun 2021 12:56:47 +0200 Subject: [PATCH 3/3] Update sbt-github-actions to 0.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3cb64c4..7941fda 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20")