From 775f9240754e3f53abd451fbef4a60e918e3ce7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Sat, 2 Dec 2023 12:55:23 +0200 Subject: [PATCH] Switch to setup-java action --- .github/workflows/ci.yml | 34 ++++++++++++++++++---------------- .github/workflows/release.yml | 10 ++++++++-- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84a9f8a..b05e8cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,16 +14,17 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@v3 - - uses: coursier/cache-action@v6 - - uses: laughedelic/coursier-setup@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: - jvm: adopt:14 - apps: sbtn - - run: sbtn scalafixAll --check - - run: sbtn scalafmtCheckAll - - run: sbtn scalafmtSbtCheck - - run: sbtn headerCheckAll + distribution: temurin + java-version: 17 + cache: sbt + + - run: sbt --client scalafixAll --check + - run: sbt --client scalafmtCheckAll + - run: sbt --client scalafmtSbtCheck + - run: sbt --client headerCheckAll - name: yaml-lint uses: ibiqlik/action-yamllint@v3 @@ -33,11 +34,12 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@v3 - - uses: coursier/cache-action@v6 - - uses: laughedelic/coursier-setup@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: - jvm: adopt:14 - apps: sbtn - - run: sbtn +compile - - run: sbtn +test + distribution: temurin + java-version: 17 + cache: sbt + + - run: sbt --client +compile + - run: sbt --client +test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9ca48e3..0a19e3d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,16 @@ jobs: publish: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v13 + + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: sbt + - run: sbt ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}