Skip to content

Commit

Permalink
fix github actions (#287)
Browse files Browse the repository at this point in the history
sbt is no longer included by default in the ubuntu 24 runner
https://github.com/sbt/setup-sbt
actions/setup-java#712 (comment)
  • Loading branch information
mpollmeier authored Jan 7, 2025
1 parent 066654d commit de83358
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 21 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@ jobs:
pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
distribution: temurin
java-version: 21
- uses: actions/cache@v2
with:
path: |
~/.sbt
~/.coursier
key: ${{ runner.os }}-sbt-${{ hashfiles('**/build.sbt') }}
cache: sbt
- uses: sbt/setup-sbt@v1
- name: scalafmtCheck and tests
run: sbt scalafmtCheck Test/scalafmtCheck test
20 changes: 8 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,16 @@ jobs:
concurrency: release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- name: apt-get update
run: sudo apt-get update
- name: Install gnupg
Expand All @@ -19,17 +26,6 @@ jobs:
run: echo $PGP_SECRET | base64 --decode | gpg --batch --import
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 21
- uses: actions/cache@v2
with:
path: |
~/.sbt
~/.coursier
key: ${{ runner.os }}-sbt-${{ hashfiles('**/build.sbt') }}
- run: sbt +test ciReleaseTagNextVersion ciReleaseSonatype
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
Expand Down

0 comments on commit de83358

Please sign in to comment.