Merge branch 'master' into release-2.10

Author: jgabry

.github/workflows/R-CMD-check.yaml

@@ -30,7 +30,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/pkgdown.yaml

@@ -23,7 +23,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/test-coverage.yaml

@@ -18,7 +18,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: r-lib/actions/setup-r@v2
         with:

.github/workflows/touchstone-comment.yaml

@@ -17,11 +17,12 @@ jobs:
       pull-requests: write
     if: ${{ github.event.workflow_run.event == 'pull_request' }}
     steps:
-      - name: Download Touchstone artifact
-        id: download
+      - name: Download Touchstone comment artifact
+        id: download_comment
         uses: actions/download-artifact@v8
         with:
           name: pr
+          path: ./pr
           github-token: ${{ github.token }}
           repository: ${{ github.repository }}
           run-id: ${{ github.event.workflow_run.id }}
@@ -31,7 +32,7 @@ jobs:
         id: pr
         shell: bash
         run: |
-          number="$(tr -cd '0-9' < ./NR)"
+          number="$(tr -cd '0-9' < ./pr/NR)"
           test -n "$number"
           echo "number=$number" >> "$GITHUB_OUTPUT"
 
@@ -42,5 +43,5 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           number_force: ${{ steps.pr.outputs.number }}
           header: touchstone
-          path: ./info.txt
+          path: ./pr/info.txt
           skip_unchanged: true

.github/workflows/touchstone-receive.yaml

@@ -4,7 +4,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
@@ -17,13 +17,14 @@ jobs:
       config: ${{ steps.read_touchstone_config.outputs.config }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
       - id: read_touchstone_config
+        shell: bash
         run: |
-          echo "config=$(jq -c . ./touchstone/config.json)" >> $GITHUB_OUTPUT
+          echo "config=$(jq -c . ./touchstone/config.json)" >> "$GITHUB_OUTPUT"
 
   build:
     needs: prepare
@@ -33,12 +34,10 @@ jobs:
       matrix:
         config:
           - ${{ fromJson(needs.prepare.outputs.config) }}
+    env:
+      RSPM: ${{ matrix.config.rspm }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
       - uses: lorenzwalthert/touchstone/actions/receive@main
         with:
           r-version: ${{ matrix.config.r }}
-          touchstone_ref: '@main'
+          touchstone_ref: "@main"

touchstone/config.json

@@ -1,8 +1,5 @@
 {
   "os": "ubuntu-24.04",
   "r": "4.5.3",
-  "rspm": "https://packagemanager.posit.co/cran/__linux__/jammy/latest",
-  "benchmarking_repo": "",
-  "benchmarking_ref": "",
-  "benchmarking_path": ""
+  "rspm": "https://packagemanager.posit.co/cran/__linux__/noble/latest"
 }