From bc26719e182ac54753f9ce9aa62972af4f2bde27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Sun, 17 Sep 2023 15:48:40 +0300 Subject: [PATCH 1/6] Fix `vdiffr` related issue on R-devel --- .github/workflows/R-CMD-check.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 14883ef5..a3e822e4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,13 +1,13 @@ on: workflow_dispatch: push: - branches: [main, master, develop, release, auto-update-test] + branches: [main, master, develop, release, auto-update-test, update-gha-workflows] pull_request: branches: [main, master, develop, release] schedule: # (see https://crontab.guru) - cron: "5 3 * */2 WED" - + name: R-CMD-check jobs: @@ -43,17 +43,17 @@ jobs: http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - extra-packages: any::rcmdcheck, any::devtools, local::. - needs: check - - name: Install dependencies (for R-devel) if: matrix.config.r == 'devel' run: | - remotes::install_cran("vdiffr", type = "source", force = TRUE) + install.packages("vdiffr", type = "source") shell: Rscript {0} + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck, any::devtools, local::. + needs: check + - name: Install dependencies (for R-oldrel) if: matrix.config.r == 'oldrel' || matrix.config.r == '3.6' run: | From 3c23b18a5ebbe682a1115de19ac2b4ac2d6a4714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 9 Oct 2023 21:53:42 +0300 Subject: [PATCH 2/6] Update drat--insert-package.yaml --- .github/workflows/drat--insert-package.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/drat--insert-package.yaml b/.github/workflows/drat--insert-package.yaml index 3b48da65..ecebefc1 100644 --- a/.github/workflows/drat--insert-package.yaml +++ b/.github/workflows/drat--insert-package.yaml @@ -32,6 +32,9 @@ on: workflow_dispatch: push: branches: [develop, auto-update-test] + schedule: + # (see https://crontab.guru) + - cron: "10 3 * */2 WED" name: Publish to pkg-repo (drat) From 5290eced9432b11cad4995ca44eca2e0c8bc1d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 2 May 2024 18:02:37 +0300 Subject: [PATCH 3/6] Force dependencies between GHA steps --- .github/workflows/R-CMD-check.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 91692a08..bbb01084 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -58,18 +58,21 @@ jobs: run: | remotes::install_version("roxygen2", "7.2.3") shell: Rscript {0} + needs: setup-r-dependencies - name: Install dependencies (for R-devel) if: matrix.config.r == 'devel' run: | remotes::install_cran("vdiffr", type = "source", force = TRUE) shell: Rscript {0} + needs: setup-r-dependencies - name: Install dependencies (for R-oldrel) if: matrix.config.r == 'oldrel' || matrix.config.r == '3.6' run: | remotes::install_version("rgl", "0.100.50") shell: Rscript {0} + needs: setup-r-dependencies - name: Roxygenize run: | From bf74336763abb96e84f1d44d04b99287b45292ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 2 May 2024 18:02:37 +0300 Subject: [PATCH 4/6] Force dependencies between GHA steps --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 91692a08..0bfb1f45 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -58,6 +58,7 @@ jobs: run: | remotes::install_version("roxygen2", "7.2.3") shell: Rscript {0} + needs: setup-r-dependencies - name: Install dependencies (for R-devel) if: matrix.config.r == 'devel' From 8b1798b13b4f7d060b14883ae80d5396639d7c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 2 May 2024 18:22:20 +0300 Subject: [PATCH 5/6] Re-arrange GHA workflow steps --- .github/workflows/R-CMD-check.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index bbb01084..1052a285 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -43,12 +43,6 @@ jobs: http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - name: Install dependencies (for R-devel) - if: matrix.config.r == 'devel' - run: | - remotes::install_cran("vdiffr", type = "source", force = TRUE) - shell: Rscript {0} - - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: any::rcmdcheck, any::devtools, any::remotes, local::. @@ -58,21 +52,24 @@ jobs: run: | remotes::install_version("roxygen2", "7.2.3") shell: Rscript {0} - needs: setup-r-dependencies - name: Install dependencies (for R-devel) if: matrix.config.r == 'devel' run: | remotes::install_cran("vdiffr", type = "source", force = TRUE) shell: Rscript {0} - needs: setup-r-dependencies + + - name: Install dependencies (for R-devel) + if: matrix.config.r == 'devel' + run: | + remotes::install_cran("vdiffr", type = "source", force = TRUE) + shell: Rscript {0} - name: Install dependencies (for R-oldrel) if: matrix.config.r == 'oldrel' || matrix.config.r == '3.6' run: | remotes::install_version("rgl", "0.100.50") shell: Rscript {0} - needs: setup-r-dependencies - name: Roxygenize run: | From d6434c8b8fe977bf66894f73a22306c160d4ce15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Thu, 2 May 2024 18:26:33 +0300 Subject: [PATCH 6/6] Remove repeated GHA workflow step --- .github/workflows/R-CMD-check.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 1052a285..126c15ee 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -59,12 +59,6 @@ jobs: remotes::install_cran("vdiffr", type = "source", force = TRUE) shell: Rscript {0} - - name: Install dependencies (for R-devel) - if: matrix.config.r == 'devel' - run: | - remotes::install_cran("vdiffr", type = "source", force = TRUE) - shell: Rscript {0} - - name: Install dependencies (for R-oldrel) if: matrix.config.r == 'oldrel' || matrix.config.r == '3.6' run: |