Merge remote-tracking branch 'origin/main' into document-orderly-schema

mrc-ide · Dec 13, 2024 · 3684542 · 3684542
2 parents ad70c6b + da43738
commit 3684542
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -34,14 +34,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-pandoc@v2
-
-      - uses: r-lib/actions/setup-r@v2
-        with:
-          r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
-          use-public-rspm: true
-
       # Compiling outpack server from source takes a few minutes each time.
       # This action will cache the result and re-use it on subsequent builds.
       # The cache is keyed by Git revision, allowing us to pick up new versions
@@ -53,6 +45,14 @@ jobs:
           git: https://github.com/mrc-ide/outpack_server
           features: git2/vendored-libgit2
 
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          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

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -17,10 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v2
-        with:
-          use-public-rspm: true
-
       # Compiling outpack server from source takes a few minutes each time.
       # This action will cache the result and re-use it on subsequent builds.
       # The cache is keyed by Git revision, allowing us to pick up new versions
@@ -32,6 +28,10 @@ jobs:
           git: https://github.com/mrc-ide/outpack_server
           features: git2/vendored-libgit2
 
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::covr