From 687299ce509b9bc1d61ba378bbfdecbdd7340711 Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Tue, 3 Jan 2023 16:09:22 -0800 Subject: [PATCH 1/7] Add updated R CMD check workflow --- .github/workflows/r-lib-check.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/r-lib-check.yaml diff --git a/.github/workflows/r-lib-check.yaml b/.github/workflows/r-lib-check.yaml new file mode 100644 index 0000000..8d12642 --- /dev/null +++ b/.github/workflows/r-lib-check.yaml @@ -0,0 +1,14 @@ +--- +name: R-CMD-check (r-lib) +'on': + pull_request: + branches: + - main + push: + branches: + - main +jobs: + R-CMD-check: + runs-on: ubuntu-latest + steps: + - uses: uclahs-cds/tool-R-CMD-check-action@stable From c3372d069868c5e2975778b143aaff91e149e580 Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 10:45:52 -0700 Subject: [PATCH 2/7] Install LaTeX in R CMD check workflow --- .github/workflows/r-lib-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r-lib-check.yaml b/.github/workflows/r-lib-check.yaml index 8d12642..cd7304e 100644 --- a/.github/workflows/r-lib-check.yaml +++ b/.github/workflows/r-lib-check.yaml @@ -11,4 +11,5 @@ jobs: R-CMD-check: runs-on: ubuntu-latest steps: + - uses: r-lib/actions/setup-tinytex@v2 - uses: uclahs-cds/tool-R-CMD-check-action@stable From 3a475d2ba8f49801ed7ee3665b6129352305910a Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 11:30:29 -0700 Subject: [PATCH 3/7] Run R CMD check weekly --- .github/workflows/r-lib-check.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/r-lib-check.yaml b/.github/workflows/r-lib-check.yaml index cd7304e..3c19095 100644 --- a/.github/workflows/r-lib-check.yaml +++ b/.github/workflows/r-lib-check.yaml @@ -7,6 +7,8 @@ name: R-CMD-check (r-lib) push: branches: - main + schedule: + - cron: '0 0 * * MON' jobs: R-CMD-check: runs-on: ubuntu-latest From ae2cc8eb509e1d3ca33a2e20f22d6b44ca7d9bcf Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 11:30:49 -0700 Subject: [PATCH 4/7] Remove outdated R CMD check workflow --- .github/workflows/R-CMD-check.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/R-CMD-check.yaml diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml deleted file mode 100644 index ba3bc55..0000000 --- a/.github/workflows/R-CMD-check.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: R-CMD-check - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - R-CMD-check: - runs-on: ubuntu-latest - - container: - image: blcdsdockerregistry/bl-r-devel:latest - - steps: - - uses: actions/checkout@v2 - with: - path: VennDiagram - - run: R CMD build --compact-vignettes="gs+qpdf" VennDiagram - - run: R CMD check --as-cran --run-donttest VennDiagram_*.tar.gz From 85e543115fa0741dbe0b5e6c2f5155be53c45613 Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 11:31:34 -0700 Subject: [PATCH 5/7] Enable R CMD check workflow dispatch --- .github/workflows/r-lib-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r-lib-check.yaml b/.github/workflows/r-lib-check.yaml index 3c19095..ac9b6bb 100644 --- a/.github/workflows/r-lib-check.yaml +++ b/.github/workflows/r-lib-check.yaml @@ -1,6 +1,7 @@ --- name: R-CMD-check (r-lib) 'on': + workflow_dispatch pull_request: branches: - main From c133a862c82ada368af91fe01548547ba13c9f50 Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 11:40:37 -0700 Subject: [PATCH 6/7] Fix YAML --- .github/workflows/r-lib-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/r-lib-check.yaml b/.github/workflows/r-lib-check.yaml index ac9b6bb..d537461 100644 --- a/.github/workflows/r-lib-check.yaml +++ b/.github/workflows/r-lib-check.yaml @@ -1,7 +1,7 @@ --- name: R-CMD-check (r-lib) -'on': - workflow_dispatch +on: + workflow_dispatch: pull_request: branches: - main From 82bd7f91904a24ee061ce4e82963f1956a57de5e Mon Sep 17 00:00:00 2001 From: Dan Knight Date: Wed, 23 Aug 2023 12:01:02 -0700 Subject: [PATCH 7/7] Update changelog --- DESCRIPTION | 4 ++-- NEWS | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 65d5a5f..71e298a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: VennDiagram -Version: 1.7.5 +Version: 1.7.6 Type: Package Title: Generate High-Resolution Venn and Euler Plots -Date: 2022-09-19 +Date: 2023-08-23 Author: Hanbo Chen Maintainer: Paul Boutros Imports: diff --git a/NEWS b/NEWS index d192adf..25c4369 100755 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +VennDiagram 1.7.6 2023-08-23 (Dan Knight) +--------------------------------------------------------------------------------------------------- +PATCH +* Update R CMD check CI/CD workflow. + VennDiagram 1.7.5 2023-02-28 (Stefan Eng) --------------------------------------------------------------------------------------------------- MINOR UPDATE