From fab70806f087cc0d65cc8df0b455e67bf500bcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Mon, 15 Mar 2021 13:50:59 +0100 Subject: [PATCH 1/8] tweak pkgdown workflow to install usethis fix #1552 --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index d103d2ebe..898812d70 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -65,6 +65,8 @@ Suggests: VignetteBuilder: knitr Config/testthat/edition: 3 +Config/Needs/website: + usethis Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.1.1.9001 From 5b412d61e13eea297b5d7113c90a24f5888a0855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Wed, 17 Mar 2021 13:41:23 +0100 Subject: [PATCH 2/8] Update pkgdown.yaml --- .github/workflows/pkgdown.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 3b2123dfc..0b508139a 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -53,7 +53,7 @@ jobs: - name: Install dependencies run: | - pak::local_install_dev_deps(upgrade = TRUE) + pak::local_install_dev_deps(upgrade = TRUE, dependencies = c("all", "Config/needs/website")) pak::pkg_install("pkgdown") shell: Rscript {0} From c7059b657d748dd723d36978f8d59b3c1e0f88d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Wed, 17 Mar 2021 13:51:20 +0100 Subject: [PATCH 3/8] Update pkgdown.yaml --- .github/workflows/pkgdown.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 0b508139a..2649c4558 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -53,7 +53,7 @@ jobs: - name: Install dependencies run: | - pak::local_install_dev_deps(upgrade = TRUE, dependencies = c("all", "Config/needs/website")) + pak::local_install_dev_deps(dependencies = c(direct = c("all", "Config/needs/website"))) pak::pkg_install("pkgdown") shell: Rscript {0} From 5f24acc70803d97d1655a8caf8a57b8e40f5f323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Wed, 17 Mar 2021 14:52:34 +0100 Subject: [PATCH 4/8] thanks @gaborcsardi --- .github/workflows/pkgdown.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 2649c4558..f9dde458e 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -28,13 +28,13 @@ jobs: id: install-r - uses: r-lib/actions/setup-pandoc@v1 - + - uses: r-lib/actions/setup-tinytex@v1 - name: Install pak and query dependencies run: | install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/") - saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds") + saveRDS(pak::pkg_deps("local::.", dependencies = c("all", "Config/Needs/website")), ".github/r-depends.rds") shell: Rscript {0} - name: Cache R packages @@ -53,7 +53,7 @@ jobs: - name: Install dependencies run: | - pak::local_install_dev_deps(dependencies = c(direct = c("all", "Config/needs/website"))) + pak::local_install_dev_deps(dependencies = c("all", "Config/Needs/website")) pak::pkg_install("pkgdown") shell: Rscript {0} @@ -89,4 +89,4 @@ jobs: # enable-commit-status: true #o verwrites-pull-request-comment: true timeout-minutes: 1 - + From a5a957f943601130149ff0cadc6aa4c334b0ff3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Thu, 18 Mar 2021 14:50:31 +0100 Subject: [PATCH 5/8] thanks @gaborcsardi again --- .github/workflows/pkgdown.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index f9dde458e..8aeaa9239 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -33,7 +33,7 @@ jobs: - name: Install pak and query dependencies run: | - install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/") + install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/dev/") saveRDS(pak::pkg_deps("local::.", dependencies = c("all", "Config/Needs/website")), ".github/r-depends.rds") shell: Rscript {0} From 8a8e091435f92e0146255f6b2c7afbcfed334527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Thu, 18 Mar 2021 14:53:02 +0100 Subject: [PATCH 6/8] clear the cache @gaborcsardi --- .github/workflows/pkgdown.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 8aeaa9239..aaf729cc3 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -41,8 +41,8 @@ jobs: uses: actions/cache@v2 with: path: ${{ env.R_LIBS_USER }} - key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }} - restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1- + key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-2-${{ hashFiles('.github/r-depends.rds') }} + restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-2- - name: Install system dependencies if: runner.os == 'Linux' From 85d5244b83aaa9baaba2691325f4c2332b44d546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Thu, 18 Mar 2021 15:31:44 +0100 Subject: [PATCH 7/8] sudo --- .github/workflows/pkgdown.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index aaf729cc3..50a1b9578 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -33,9 +33,8 @@ jobs: - name: Install pak and query dependencies run: | - install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/dev/") - saveRDS(pak::pkg_deps("local::.", dependencies = c("all", "Config/Needs/website")), ".github/r-depends.rds") - shell: Rscript {0} + sudo R -q -e 'install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/dev/")' + sudo R -q -e 'saveRDS(pak::pkg_deps("local::.", dependencies = c("all", "Config/Needs/website")), ".github/r-depends.rds")' - name: Cache R packages uses: actions/cache@v2 From dc10588cd2ed365bd3e851cde3002f545d0881c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 19 Mar 2021 13:16:10 +0100 Subject: [PATCH 8/8] back to original file --- .github/workflows/pkgdown.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 50a1b9578..bbdbee5c3 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -33,15 +33,16 @@ jobs: - name: Install pak and query dependencies run: | - sudo R -q -e 'install.packages("pak", lib = .Library, repos = "https://r-lib.github.io/p/pak/dev/")' - sudo R -q -e 'saveRDS(pak::pkg_deps("local::.", dependencies = c("all", "Config/Needs/website")), ".github/r-depends.rds")' + install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/") + saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds") + shell: Rscript {0} - name: Cache R packages uses: actions/cache@v2 with: path: ${{ env.R_LIBS_USER }} - key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-2-${{ hashFiles('.github/r-depends.rds') }} - restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-2- + key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }} + restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1- - name: Install system dependencies if: runner.os == 'Linux' @@ -52,7 +53,7 @@ jobs: - name: Install dependencies run: | - pak::local_install_dev_deps(dependencies = c("all", "Config/Needs/website")) + pak::local_install_dev_deps(upgrade = TRUE) pak::pkg_install("pkgdown") shell: Rscript {0} @@ -88,4 +89,3 @@ jobs: # enable-commit-status: true #o verwrites-pull-request-comment: true timeout-minutes: 1 -