Skip to content

ci: test pull requests against the merge ref, not the stale head #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vpavlin merged 1 commit into from
Sep 9, 2026
Merged

ci: test pull requests against the merge ref, not the stale head #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ jobs:
lez-rev: ${{ steps.lez-ref.outputs.LEZ_REV }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: dtolnay/rust-toolchain@stable
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
Expand Down Expand Up @@ -169,8 +167,6 @@ jobs:
RISC0_VERSION: "3.0.5"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: dtolnay/rust-toolchain@stable
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
Expand Down Expand Up @@ -217,7 +213,7 @@ jobs:
id: spel-ref
run: |
if [ "${{ github.event_name }}" = "pull_request" ]; then
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/head"
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/merge"
else
SPEL_REF="${{ github.sha }}"
fi
Expand Down Expand Up @@ -256,8 +252,6 @@ jobs:
RISC0_VERSION: "3.0.5"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: dtolnay/rust-toolchain@stable
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
Expand Down Expand Up @@ -304,7 +298,7 @@ jobs:
id: spel-ref
run: |
if [ "${{ github.event_name }}" = "pull_request" ]; then
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/head"
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/merge"
else
SPEL_REF="${{ github.sha }}"
fi
Expand Down Expand Up @@ -343,8 +337,6 @@ jobs:
RISC0_VERSION: "3.0.5"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: dtolnay/rust-toolchain@stable
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
Expand Down Expand Up @@ -385,7 +377,7 @@ jobs:
id: spel-ref
run: |
if [ "${{ github.event_name }}" = "pull_request" ]; then
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/head"
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/merge"
else
SPEL_REF="${{ github.sha }}"
fi
Expand Down Expand Up @@ -418,8 +410,6 @@ jobs:
RISC0_VERSION: "3.0.5"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: dtolnay/rust-toolchain@stable
- name: Install system dependencies
run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev
Expand Down Expand Up @@ -460,7 +450,7 @@ jobs:
id: spel-ref
run: |
if [ "${{ github.event_name }}" = "pull_request" ]; then
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/head"
SPEL_REF="refs/pull/${{ github.event.pull_request.number }}/merge"
else
SPEL_REF=""
fi
Expand Down
6 changes: 4 additions & 2 deletions scripts/init-e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Required Environment Variables:
# LSSA_DIR - Path to logos-execution-zone directory with sequencer built
# Optional Environment Variables:
# SPEL_TAG - SPEL revision for init (e.g. refs/pull/XXX/head). If unset,
# SPEL_TAG - SPEL revision for init (e.g. refs/pull/XXX/merge). If unset,
# spel init uses its hardcoded default (branch = "main").

set -euo pipefail
Expand Down Expand Up @@ -88,7 +88,9 @@ cd "$WORK_DIR"

# ─── Step 1: spel init — default LEZ, optional SPEL override ─────────────
# Always uses DEFAULT LEZ resolution (no --lez-tag) to test init.rs defaults.
# On PRs, SPEL_TAG is set so the scaffolded project uses the PR's framework code.
# On PRs, SPEL_TAG is set to the PR's *merge* ref, so the scaffolded project
# uses the PR's framework code as it would land: the PR merged into current
# main, matching what the runner has checked out.
# On main pushes, SPEL_TAG is unset so the default refs are tested.
# SPEL_GIT is always set in CI (the repo's own URL) so forks test their own
# code; only local runs without SPEL_GIT exercise the built-in default URL.
Expand Down
2 changes: 1 addition & 1 deletion scripts/multisig-e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# LEZ_TAG - LEZ revision/tag to test against
# LSSA_DIR - Path to logos-execution-zone directory with sequencer built
# Optional Environment Variables:
# SPEL_TAG - SPEL revision for init (e.g. refs/pull/XXX/head)
# SPEL_TAG - SPEL revision for init (e.g. refs/pull/XXX/merge)
# SPEL_GIT - SPEL git URL for init (fork testing)
# SPEL_BIN - Path to the spel binary (default /tmp/lssa/target/release/spel)

Expand Down
Loading