Skip to content

Commit

Permalink
ci: Use Ubuntu 24.04 and styler PR (#2248)
Browse files Browse the repository at this point in the history
* ci: Use Ubuntu 24.04 and styler PR

* ci: Use Ubuntu 24.04 for fledge, squash

* ci: Fix macOS (#16)

* R >= 4.0.0
  • Loading branch information
krlmlr committed Nov 24, 2024
1 parent 17e1f89 commit ff368fb
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-status.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name: rcc-status

jobs:
rcc-status:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

name: "Update commit status"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ name: rcc

jobs:
rcc-smoke:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
sha: ${{ steps.commit.outputs.sha }}
versions-matrix: ${{ steps.versions-matrix.outputs.matrix }}
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
cache-version: rcc-smoke-2
needs: check, website
# Beware of using dev pkgdown here, has brought in dev dependencies in the past
extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler r-lib/pkgdown deps::.
extra-packages: any::rcmdcheck r-lib/roxygen2 any::decor r-lib/styler#1235 r-lib/pkgdown deps::.

- name: Install package
run: |
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
shell: bash

rcc-smoke-check-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

name: "Check matrix"

Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/custom/before-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,11 @@ name: 'Custom steps to run before R packages are installed'
runs:
using: "composite"
steps:
- name: Define R CMD check error condition
# Rscript not available on Mac
if: runner.os != 'macOS'
run: |
if (getRversion() < "4.0") {
message("Setting RCMDCHECK_ERROR_ON")
cat('RCMDCHECK_ERROR_ON="warning"\n', file = Sys.getenv("GITHUB_ENV"), append = TRUE)
}
shell: Rscript {0}

- name: Define _R_CHECK_PKG_SIZES_THRESHOLD_
run: |
echo '_R_CHECK_PKG_SIZES_THRESHOLD_=10' | tee -a $GITHUB_ENV
shell: bash

- name: Define _R_CHECK_FORCE_SUGGESTS_
# Rscript not available on Mac
if: runner.os != 'macOS'
run: |
if (getRversion() < "4.0") {
message("Setting _R_CHECK_FORCE_SUGGESTS_")
cat('_R_CHECK_FORCE_SUGGESTS_=false\n', file = Sys.getenv("GITHUB_ENV"), append = TRUE)
}
shell: Rscript {0}

- name: Define DM_TEST_SRC
run: |
echo "DM_TEST_SRC=${{ matrix.config.test-src }}" | tee -a $GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/fledge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
check_fork:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
is_forked: ${{ steps.check.outputs.is_forked }}
steps:
Expand All @@ -33,7 +33,7 @@ jobs:
shell: bash

fledge:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: check_fork
if: needs.check_fork.outputs.is_forked == 'false'
permissions:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
set -x
gh pr create --base main --head fledge --fill-first
gh workflow run rcc -f ref=$(git rev-parse HEAD)
gh pr merge --merge --auto
gh pr merge --squash --auto
shell: bash

- name: Check release
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ runs:
echo "_R_CHECK_CRAN_INCOMING_USE_ASPELL_=true" | tee -a $GITHUB_ENV
shell: bash

- name: Remove [email protected]
if: runner.os == 'macOS'
run: |
brew uninstall [email protected]
shell: bash

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
lock:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: dessant/lock-threads@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:

jobs:
pkgdown:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

name: "pkgdown"

Expand Down

0 comments on commit ff368fb

Please sign in to comment.