Skip to content

Commit 9ca62e2

Browse files
authored
Merge pull request #377 from stan-dev/update-touchstone-setup
Minor updates to touchstone workflow
2 parents 00a2855 + 710ddfe commit 9ca62e2

3 files changed

Lines changed: 12 additions & 15 deletions

File tree

.github/workflows/touchstone-comment.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
pull-requests: write
1818
if: ${{ github.event.workflow_run.event == 'pull_request' }}
1919
steps:
20-
- name: Download Touchstone artifact
21-
id: download
20+
- name: Download Touchstone comment artifact
21+
id: download_comment
2222
uses: actions/download-artifact@v8
2323
with:
2424
name: pr
25+
path: ./pr
2526
github-token: ${{ github.token }}
2627
repository: ${{ github.repository }}
2728
run-id: ${{ github.event.workflow_run.id }}
@@ -31,7 +32,7 @@ jobs:
3132
id: pr
3233
shell: bash
3334
run: |
34-
number="$(tr -cd '0-9' < ./NR)"
35+
number="$(tr -cd '0-9' < ./pr/NR)"
3536
test -n "$number"
3637
echo "number=$number" >> "$GITHUB_OUTPUT"
3738
@@ -42,5 +43,5 @@ jobs:
4243
GITHUB_TOKEN: ${{ github.token }}
4344
number_force: ${{ steps.pr.outputs.number }}
4445
header: touchstone
45-
path: ./info.txt
46+
path: ./pr/info.txt
4647
skip_unchanged: true

.github/workflows/touchstone-receive.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions:
44
contents: read
55

66
concurrency:
7-
group: ${{ github.workflow }}-${{ github.head_ref }}
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
88
cancel-in-progress: true
99

1010
on:
@@ -22,8 +22,9 @@ jobs:
2222
fetch-depth: 0
2323

2424
- id: read_touchstone_config
25+
shell: bash
2526
run: |
26-
echo "config=$(jq -c . ./touchstone/config.json)" >> $GITHUB_OUTPUT
27+
echo "config=$(jq -c . ./touchstone/config.json)" >> "$GITHUB_OUTPUT"
2728
2829
build:
2930
needs: prepare
@@ -33,12 +34,10 @@ jobs:
3334
matrix:
3435
config:
3536
- ${{ fromJson(needs.prepare.outputs.config) }}
37+
env:
38+
RSPM: ${{ matrix.config.rspm }}
3639
steps:
37-
- name: Checkout repo
38-
uses: actions/checkout@v7
39-
with:
40-
fetch-depth: 0
4140
- uses: lorenzwalthert/touchstone/actions/receive@main
4241
with:
4342
r-version: ${{ matrix.config.r }}
44-
touchstone_ref: '@main'
43+
touchstone_ref: "@main"

touchstone/config.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"os": "ubuntu-24.04",
33
"r": "4.5.3",
4-
"rspm": "https://packagemanager.posit.co/cran/__linux__/jammy/latest",
5-
"benchmarking_repo": "",
6-
"benchmarking_ref": "",
7-
"benchmarking_path": ""
4+
"rspm": "https://packagemanager.posit.co/cran/__linux__/noble/latest"
85
}

0 commit comments

Comments
 (0)