From b0b62bea4af6140716ebe2439029d9f91abca505 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 15 Aug 2021 00:47:10 +0200 Subject: [PATCH 1/2] Update sbt-github-actions to 0.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b93fdf9..0ab22e5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") From a1d0a035d6d9c3688830f097f17a5bf64c9f11ec Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 15 Aug 2021 00:47:31 +0200 Subject: [PATCH 2/2] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/clean.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e05d306..04b22aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} @@ -50,13 +50,13 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check formatting with scalafmt - run: sbt --client '++${{ matrix.scala }}; scalafmtCheckAll; scalafmtSbtCheck' + run: sbt ++${{ matrix.scala }} scalafmtCheckAll scalafmtSbtCheck - name: Check that workflows are up to date - run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' + run: sbt ++${{ matrix.scala }} githubWorkflowCheck - name: Build project - run: sbt --client '++${{ matrix.scala }}; test' + run: sbt ++${{ matrix.scala }} test - name: Compress target directories run: tar cf targets.tar target managerial/target managerial-twitter-util/target project/target @@ -84,7 +84,7 @@ jobs: fetch-depth: 0 - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} @@ -125,4 +125,4 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt --client '++${{ matrix.scala }}; ci-release' \ No newline at end of file + run: sbt ++${{ matrix.scala }} ci-release 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