Skip to content

Commit

Permalink
fix github actions runner (#5192)
Browse files Browse the repository at this point in the history
* fix github actions runner

sbt is no longer included by default in the ubuntu 24 runner
https://github.com/sbt/setup-sbt
actions/setup-java#712 (comment)

* forgot a few places

* temporarily disable citation action

Error: Rscript: command not found
#4069

* try to reenable citation action and configure to install R
  • Loading branch information
mpollmeier authored Dec 24, 2024
1 parent adba591 commit c78eb13
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Install sbt
if: matrix.os == 'macos-latest'
run: brew install sbt
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- name: Install php
if: matrix.os == 'macos-latest'
run: brew install php
Expand Down Expand Up @@ -55,8 +54,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- uses: actions/cache@v4
with:
path: |
Expand All @@ -69,6 +70,8 @@ jobs:
if: ${{ failure() }}
- name: Validate CITATION.cff
uses: dieghernan/cff-validator@v3
with:
install-r: true

test-scripts:
runs-on: ubuntu-latest
Expand All @@ -79,8 +82,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- uses: actions/cache@v4
with:
path: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- run: sudo apt update && sudo apt install -y gnupg
- run: echo $PGP_SECRET | base64 --decode | gpg --batch --import
env:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/upgrade-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
distribution: temurin
java-version: 21
cache: sbt
- uses: sbt/setup-sbt@v1
- uses: actions/cache@v4
with:
path: |
Expand Down

0 comments on commit c78eb13

Please sign in to comment.