From 5f6a426d9b8e52ef89d7c9883e01e10d6b310b04 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 09:49:41 +0100 Subject: [PATCH 1/7] update Books workflow --- .github/workflows/Book.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Book.yaml b/.github/workflows/Book.yaml index 3410e2fbd..fb628a2fa 100644 --- a/.github/workflows/Book.yaml +++ b/.github/workflows/Book.yaml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install R uses: r-lib/actions/setup-r@v2 @@ -47,11 +47,9 @@ jobs: if: ${{ ! github.event.inputs.ghpages }} uses: r-lib/actions/setup-pandoc@v2 with: - pandoc-version: '2.17.1.1' - - - uses: cderv/actions/setup-pandoc-nightly@nightly-pandoc - # install nightly when checking on gh-pages - if: github.event.inputs.ghpages + # install nightly when checking on gh-pages + pandoc-version: ${{ github.event.inputs.ghpages && 'nightly' || '2.17.1.1'} + token: ${{ secrets.GITHUB_TOKEN }} - name: Install TinyTeX uses: r-lib/actions/setup-tinytex@v2 @@ -76,7 +74,7 @@ jobs: shell: Rscript {0} - name: Cache bookdown results - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: inst/examples/_bookdown_files key: bookdown-${{ hashFiles('inst/examples/*Rmd') }} @@ -101,7 +99,7 @@ jobs: - name: Deploy Gitbook to gh-pages if: github.event_name == 'workflow_dispatch' && github.event.inputs.ghpages - uses: JamesIves/github-pages-deploy-action@4.1.5 + uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages folder: inst/examples/_book From 93d7855cf1cdaf301e966b7e113fc7cc7bebc2f9 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 09:50:55 +0100 Subject: [PATCH 2/7] Update to lock-threads@v5 --- .github/workflows/lock.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 30d653040..b019abeb8 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -9,9 +9,10 @@ jobs: lock: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v4 + - uses: dessant/lock-threads@v5 with: github-token: ${{ github.token }} + process-only: 'issues, prs' issue-inactive-days: '180' # exclude-issue-created-before: '' # exclude-issue-created-after: '' From d454e4aefb0c9a43cc37ef919d51dbc5b6134973 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 09:53:45 +0100 Subject: [PATCH 3/7] update pkgdown workflow --- .github/workflows/pkgdown.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index bca905f6d..74db64f5c 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -21,7 +21,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -35,7 +35,7 @@ jobs: needs: website - name: Cache some pkgdown assets - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | vignettes/articles/images/*.png @@ -47,7 +47,7 @@ jobs: - name: Deploy to Netlify id: netlify-deploy - uses: nwtgck/actions-netlify@v1.1 + uses: nwtgck/actions-netlify@v2 with: publish-dir: 'reference' production-branch: main From 106d0b1b5af597313e1a09034744a1867eacfee6 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 09:56:49 +0100 Subject: [PATCH 4/7] Add concurrency on workflows --- .github/workflows/Book.yaml | 7 +++++++ .github/workflows/R-CMD-check.yaml | 7 +++++++ .github/workflows/pkgdown.yaml | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.github/workflows/Book.yaml b/.github/workflows/Book.yaml index fb628a2fa..a890ab3cd 100644 --- a/.github/workflows/Book.yaml +++ b/.github/workflows/Book.yaml @@ -28,6 +28,13 @@ on: name: Build and deploy book +concurrency: + # Use github.run_id on main branch + # Use github.event.pull_request.number on pull requests, so it's unique per pull request + # Use github.ref on other branches, so it's unique per branch + group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: runs-on: macOS-latest diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a911b0d84..93a13d233 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -24,6 +24,13 @@ on: name: R-CMD-check +concurrency: + # Use github.run_id on main branch + # Use github.event.pull_request.number on pull requests, so it's unique per pull request + # Use github.ref on other branches, so it's unique per branch + group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 74db64f5c..e7d33fb4c 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -11,6 +11,13 @@ on: name: pkgdown +concurrency: + # Use github.run_id on main branch + # Use github.event.pull_request.number on pull requests, so it's unique per pull request + # Use github.ref on other branches, so it's unique per branch + group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: pkgdown: if: ${{ github.event_name == 'push' || startsWith(github.head_ref, 'pkgdown/') }} From 2fbc5fabb0d5508215f339c7aba10c4a8d7b07d6 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 10:22:13 +0100 Subject: [PATCH 5/7] Don't install pandoc in the setup-r-dependency action as it is done before --- .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 e32da1e26..56380509f 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -95,6 +95,7 @@ jobs: with: extra-packages: any::rcmdcheck needs: check + install-pandoc: false - name: Pandoc and Tinytex info run: | From 18921f6a318f2e0da5afe4b084b753850dae7b03 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 11:08:48 +0100 Subject: [PATCH 6/7] get the install-pandoc fix --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 56380509f..d089b381c 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -91,7 +91,7 @@ jobs: cat(readLines("~/.Rprofile"), sep = "\n") shell: Rscript {0} - - uses: r-lib/actions/setup-r-dependencies@v2 + - uses: r-lib/actions/setup-r-dependencies@v2-branch with: extra-packages: any::rcmdcheck needs: check From 5a74cf1d34299656ecb2a1f4e870ffab8fa7964a Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 29 Feb 2024 11:12:35 +0100 Subject: [PATCH 7/7] retry auto detection as it should be fixed --- .github/workflows/R-CMD-check.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index d089b381c..38dbc91dd 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -95,7 +95,6 @@ jobs: with: extra-packages: any::rcmdcheck needs: check - install-pandoc: false - name: Pandoc and Tinytex info run: |