Tweak R CI to work with ubuntu-latest, add cancellation of in-progr…

…ess CI (#62)
CDCgov · Jan 18, 2025 · e111b30 · e111b30
1 parent 7daf461
commit e111b30
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -9,6 +9,10 @@ on:
     types: [published]
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 name: pkgdown
 
 jobs:
@@ -26,15 +30,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-pandoc@v2
-        with:
-          pandoc-version: "2.19.2"
-
       - uses: r-lib/actions/setup-r@v2
         with:
-          r-version: "4.3.1"
           use-public-rspm: true
-          install-r: false
+
+      - uses: r-lib/actions/setup-pandoc@v2
+        with:
+          pandoc-version: "2.19.2"
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -5,12 +5,19 @@ on:
   push:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v5
+    - uses: r-lib/actions/setup-r@v2
+      with:
+        use-public-rspm: true
     - uses: actions/cache@v4
       with:
         path: "~/.cache/R/renv"

diff --git a/.github/workflows/r-cmd-check.yaml b/.github/workflows/r-cmd-check.yaml
@@ -5,6 +5,10 @@ on:
   push:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-package:
     strategy: