Skip to content

Commit

Permalink
GA: modernize
Browse files Browse the repository at this point in the history
  • Loading branch information
HenrikBengtsson committed Feb 17, 2024
1 parent e3b8f3e commit e9630f8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ jobs:
R-CMD-check:
if: "! contains(github.event.head_commit.message, '[ci skip]')"

timeout-minutes: 30

runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }}) ${{ matrix.config.label }}
Expand All @@ -14,17 +16,17 @@ jobs:
fail-fast: false
matrix:
config:
# - {os: windows-latest, r: 'release' }
- {os: windows-latest, r: 'release' }
# - {os: macOS-latest, r: 'devel' }
# - {os: macOS-latest, r: 'release' }
# - {os: ubuntu-20.04, r: 'devel' }
- {os: ubuntu-20.04, r: 'release' }
- {os: ubuntu-20.04, r: 'oldrel' }
- {os: ubuntu-20.04, r: 'oldrel-1' }
- {os: ubuntu-latest, r: 'devel' }
- {os: ubuntu-latest, r: 'release' }
- {os: ubuntu-latest, r: 'oldrel' }
- {os: ubuntu-latest, r: 'oldrel-1' }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest
RSPM: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
## R CMD check
_R_CHECK_CRAN_INCOMING_: false
Expand All @@ -38,7 +40,7 @@ jobs:
R_FUTURE_RNG_ONMISUSE: error

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand All @@ -58,7 +60,7 @@ jobs:

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
Expand Down Expand Up @@ -111,7 +113,7 @@ jobs:

- name: Upload check results
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
8 changes: 5 additions & 3 deletions .github/workflows/covr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ jobs:
covr:
if: "! contains(github.event.head_commit.message, '[ci skip]')"

runs-on: ubuntu-20.04
timeout-minutes: 30

runs-on: ubuntu-latest

name: covr

Expand All @@ -24,7 +26,7 @@ jobs:
_R_CHECK_CRAN_INCOMING_: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand All @@ -40,7 +42,7 @@ jobs:
shell: Rscript {0}

- name: Cache R packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
Expand Down

0 comments on commit e9630f8

Please sign in to comment.