Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/touchstone-comment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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"

Expand All @@ -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
13 changes: 6 additions & 7 deletions .github/workflows/touchstone-receive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -22,8 +22,9 @@ jobs:
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
Expand All @@ -33,12 +34,10 @@ jobs:
matrix:
config:
- ${{ fromJson(needs.prepare.outputs.config) }}
env:
RSPM: ${{ matrix.config.rspm }}
steps:
- name: Checkout repo
uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: lorenzwalthert/touchstone/actions/receive@main
with:
r-version: ${{ matrix.config.r }}
touchstone_ref: '@main'
touchstone_ref: "@main"
5 changes: 1 addition & 4 deletions touchstone/config.json
Original file line number Diff line number Diff line change
@@ -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"
}
Loading