From 5361c0b2a03832a4d58403399ecc8f2d530d5768 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Thu, 5 Jan 2023 15:41:07 +0100 Subject: [PATCH] limit GitHub runners --- .github/workflows/check-old.yaml | 17 ++++++----------- .github/workflows/check-recent.yaml | 24 ++++++++---------------- DESCRIPTION | 2 +- NEWS.md | 2 +- 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/workflows/check-old.yaml b/.github/workflows/check-old.yaml index cef86728..d87d2b9f 100644 --- a/.github/workflows/check-old.yaml +++ b/.github/workflows/check-old.yaml @@ -29,12 +29,8 @@ on: push: - # run after a git push on any branch in this repo + # only run after a git push on any branch in this repo branches: '**' - schedule: - # run a schedule everyday at 1 AM. - # this is to check that all dependencies are still available (see R/zzz.R) - - cron: '0 1 * * *' name: check-old @@ -51,12 +47,11 @@ jobs: matrix: config: # Test all old versions of R >= 3.0, we support them all! - # For recent R versions, see check-recent.yaml (r-lib supports the latest 5 major versions) - - {os: ubuntu-22.04, r: '3.4', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} - - {os: ubuntu-22.04, r: '3.3', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} - - {os: ubuntu-22.04, r: '3.2', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} - - {os: ubuntu-22.04, r: '3.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} - - {os: ubuntu-22.04, r: '3.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} + # For recent R versions, see check-recent.yaml (r-lib supports the latest 5 major R versions) + - {os: ubuntu-22.04, r: '3.3', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} + - {os: ubuntu-22.04, r: '3.2', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} + - {os: ubuntu-22.04, r: '3.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} + - {os: ubuntu-22.04, r: '3.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true diff --git a/.github/workflows/check-recent.yaml b/.github/workflows/check-recent.yaml index 4d66621c..053ff003 100644 --- a/.github/workflows/check-recent.yaml +++ b/.github/workflows/check-recent.yaml @@ -34,7 +34,7 @@ on: push: branches: '**' schedule: - # run a schedule everyday at 1 AM. + # also run a schedule everyday at 1 AM. # this is to check that all dependencies are still available (see R/zzz.R) - cron: '0 1 * * *' @@ -56,26 +56,18 @@ jobs: - {os: macOS-latest, r: 'devel', allowfail: false} - {os: windows-latest, r: 'devel', allowfail: false} - {os: ubuntu-latest, r: 'devel', allowfail: false} + # current 'release' version: - {os: macOS-latest, r: '4.2', allowfail: false} - {os: windows-latest, r: '4.2', allowfail: false} - {os: ubuntu-latest, r: '4.2', allowfail: false} - # older versions: - - {os: macOS-latest, r: '4.1', allowfail: false} - - {os: windows-latest, r: '4.1', allowfail: false} - - {os: ubuntu-latest, r: '4.1', allowfail: false} - - {os: macOS-latest, r: '4.0', allowfail: false} - - {os: windows-latest, r: '4.0', allowfail: false} - - {os: ubuntu-latest, r: '4.0', allowfail: false} - - - {os: macOS-latest, r: '3.6', allowfail: false} - - {os: windows-latest, r: '3.6', allowfail: false} - - {os: ubuntu-latest, r: '3.6', allowfail: false} - - - {os: macOS-latest, r: '3.5', allowfail: false} - - {os: windows-latest, r: '3.5', allowfail: false} - - {os: ubuntu-latest, r: '3.5', allowfail: false} + # older versions (see also check-old.yaml for even older versions): + - {os: ubuntu-latest, r: '4.1', allowfail: false} + - {os: ubuntu-latest, r: '4.0', allowfail: false} + - {os: ubuntu-latest, r: '3.6', allowfail: false} + - {os: ubuntu-latest, r: '3.5', allowfail: false} + - {os: ubuntu-latest, r: '3.4', allowfail: false} # when a new R releases, this one has to move to check-old.yaml env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index 436db19b..785be4a2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.8.2.9079 +Version: 1.8.2.9080 Date: 2023-01-05 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 14a5837d..7fe9060a 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.8.2.9079 +# AMR 1.8.2.9080 *(this beta version will eventually become v2.0! We're happy to reach a new major milestone soon!)*