From 0880603b64c7d6e08472ae13c1a764ec0a8e1b07 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:09:59 -0500 Subject: [PATCH 1/4] Actually use `renv` for GHA --- .github/workflows/R-CMD-check.yaml | 9 ++++----- .github/workflows/test-coverage.yaml | 9 +++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ca6f07d8..242ce66d 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -23,16 +23,15 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: - r-version: '4.4.1' - use-public-rspm: true + r-version: 'renv' + use-public-rspm: false - uses: r-lib/actions/setup-tinytex@v2 - run: tlmgr --version - - uses: r-lib/actions/setup-r-dependencies@v2 + - uses: r-lib/actions/setup-renv@v2 with: - extra-packages: any::rcmdcheck - needs: check + profile: full - uses: r-lib/actions/check-r-package@v2 with: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index f443f107..d692b993 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -24,8 +24,8 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: - use-public-rspm: true - r-version: '4.4.1' + use-public-rspm: false + r-version: 'renv' - uses: r-lib/actions/setup-tinytex@v2 - run: tlmgr --version @@ -35,11 +35,8 @@ jobs: run: sudo apt-get install -y libcurl4-openssl-dev - uses: r-lib/actions/setup-renv@v2 - - - uses: r-lib/actions/setup-r-dependencies@v2 with: - packages: any::covr any::xml2 - needs: coverage + profile: full - name: Test coverage run: | From 3d2fd2c61cb67bd14ee2cdc24c993c58d1996d3c Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:15:21 -0500 Subject: [PATCH 2/4] Quote profile name --- .github/workflows/R-CMD-check.yaml | 2 +- .github/workflows/test-coverage.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 242ce66d..eba12af2 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -31,7 +31,7 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: - profile: full + profile: '"full"' - uses: r-lib/actions/check-r-package@v2 with: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index d692b993..c9be51fb 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -36,7 +36,7 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: - profile: full + profile: '"full"' - name: Test coverage run: | From b626a3f6ba4f00f7ef935df0c42bbf82edd4a8e6 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:20:04 -0500 Subject: [PATCH 3/4] Set working directory --- .github/workflows/R-CMD-check.yaml | 3 ++- .github/workflows/test-coverage.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index eba12af2..ba2d5719 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -32,7 +32,8 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: profile: '"full"' - + working-directory: './renv/profiles/full' + - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: false diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index c9be51fb..9bcf5119 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -37,6 +37,7 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: profile: '"full"' + working-directory: './renv/profiles/full' - name: Test coverage run: | From 36ea9c1153407c95662dbe28fc23a3904242626e Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:21:18 -0500 Subject: [PATCH 4/4] Re-hardcode R version --- .github/workflows/R-CMD-check.yaml | 3 +-- .github/workflows/test-coverage.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ba2d5719..d4d5494a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -23,7 +23,7 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: - r-version: 'renv' + r-version: '4.4.1' use-public-rspm: false - uses: r-lib/actions/setup-tinytex@v2 @@ -32,7 +32,6 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: profile: '"full"' - working-directory: './renv/profiles/full' - uses: r-lib/actions/check-r-package@v2 with: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 9bcf5119..66e9932c 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -25,7 +25,7 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: false - r-version: 'renv' + r-version: '4.4.1' - uses: r-lib/actions/setup-tinytex@v2 - run: tlmgr --version @@ -37,7 +37,6 @@ jobs: - uses: r-lib/actions/setup-renv@v2 with: profile: '"full"' - working-directory: './renv/profiles/full' - name: Test coverage run: |