From 05bebd7927d59cddba71220f3c4847faf3eb27e3 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 26 Jul 2021 23:48:05 +0200 Subject: [PATCH 1/3] Enable dependabot updates for GitHub actions --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..5ace4600a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From f7507b7a38f1492a3ee381c03c185c363f8aed97 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 26 Jul 2021 23:50:54 +0200 Subject: [PATCH 2/3] Use coursier/setup-action --- .github/workflows/ci.yml | 12 ++++++++---- scripts/ci.sh | 11 +++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60ae8c340..1d40d9568 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,10 @@ jobs: - uses: coursier/cache-action@v5 with: extraKey: ${{ matrix.PLUGIN }}-${{ matrix.TEST_GROUP }} - - uses: olafurpg/setup-scala@v10 + - uses: coursier/setup-action@v1 with: - java-version: adopt@1.8.0-232 + jvm: 8 + apps: sbt-launcher - run: scripts/ci.sh shell: bash env: @@ -49,10 +50,13 @@ jobs: fetch-depth: 0 submodules: true - uses: coursier/cache-action@v5 - - uses: olafurpg/setup-scala@v10 + - uses: coursier/setup-action@v1 + with: + jvm: 8 + apps: sbt-launcher - uses: olafurpg/setup-gpg@v3 - name: Release - run: ./sbt ci-release + run: sbt ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} diff --git a/scripts/ci.sh b/scripts/ci.sh index ce558a8ac..7de6a1ef3 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -1,17 +1,12 @@ #!/usr/bin/env bash set -euvx -./scripts/cs-setup.sh -mkdir -p bin -./cs bootstrap -o bin/sbt sbt-launcher io.get-coursier:coursier_2.12:2.0.0-RC6-25 -rm -f cs cs.exe - if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then - SBT="./bin/sbt -C--plugin-version=2.0.0-RC6-8" + SBT="sbt -C--plugin-version=2.0.0-RC6-8" elif [ "$(uname)" == "Darwin" ]; then - SBT="./bin/sbt -C--plugin-version=2.0.0-RC6-8" + SBT="sbt -C--plugin-version=2.0.0-RC6-8" else - SBT="./bin/sbt.bat -C--plugin-version=2.0.0-RC6-8" + SBT="sbt.bat -C--plugin-version=2.0.0-RC6-8" fi lmCoursier() { From 4d5b4c2e26b2146bc96ab337fddce296ff707639 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 26 Jul 2021 23:52:40 +0200 Subject: [PATCH 3/3] Update coursier/cache-action GitHub action --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d40d9568..1f5a99178 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,7 @@ jobs: with: fetch-depth: 0 submodules: true - - uses: coursier/cache-action@v5 - with: - extraKey: ${{ matrix.PLUGIN }}-${{ matrix.TEST_GROUP }} + - uses: coursier/cache-action@v6.3 - uses: coursier/setup-action@v1 with: jvm: 8 @@ -49,7 +47,7 @@ jobs: with: fetch-depth: 0 submodules: true - - uses: coursier/cache-action@v5 + - uses: coursier/cache-action@v6.3 - uses: coursier/setup-action@v1 with: jvm: 8