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
15 changes: 12 additions & 3 deletions .github/workflows/benchmark-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main --depth=1
git fetch origin main
if ! git merge --no-edit origin/main; then
git merge --abort 2>/dev/null || true
gh pr comment "${{ inputs.pr }}" \
Expand All @@ -158,7 +158,7 @@ jobs:
# replaces staged main's copy of every file under site/data, and copying the
# PR's files back over does not delete, so a file the PR removed stayed in the
# index and rode along in the results commit.
git fetch origin main --depth=1
git fetch origin main
rm -rf /tmp/main_site_data
mkdir -p /tmp/main_site_data
git archive origin/main:site/data | tar -x -C /tmp/main_site_data
Expand All @@ -178,6 +178,15 @@ jobs:
mkdir -p /tmp/bench_logs
FAILED=""
FIRST=true
# This file runs from main but the scripts come from the PR, and a branch
# cut before the compliance suites (#1777) has no scripts/spec.sh. A
# /benchmark there skips the suites instead of marking every entry
# failed; a /spec there still fails.
have_spec=true
if [ ! -f scripts/spec.sh ]; then
have_spec=false
echo "::notice::scripts/spec.sh is not on this branch (it predates #1777): merge main to run the compliance suites"
fi
for fw in $LIST; do
# Settle between frameworks. The previous entry's container has only
# just been torn down: its sockets are still draining through
Expand Down Expand Up @@ -205,7 +214,7 @@ jobs:
# failed that image may be stale, so the suites wait for the next run.
# Like the benchmark, the scores always go to disk and are committed
# only on --save.
if [ "$SPEC_ONLY" = "true" ] || { [ "$RESILIENCE_ONLY" != "true" ] && [ -z "$PROFILE" ] && $bench_ok; }; then
if [ "$SPEC_ONLY" = "true" ] || { $have_spec && [ "$RESILIENCE_ONLY" != "true" ] && [ -z "$PROFILE" ] && $bench_ok; }; then
echo "::group::spec $fw"
skip_build=1
[ "$SPEC_ONLY" = "true" ] && skip_build=0
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/pr-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,19 @@ jobs:
# merge happens inside benchmark-pr.yml after maintainer approval;
# doing the dry-run here lets us reject conflicting PRs before
# asking a maintainer to approve a run that's guaranteed to abort.
# Skipped for non-save runs since they don't push back.
# Skipped for non-save runs since they don't push back. The fetch takes
# no --depth: the checkout has full history, and a shallow fetch cuts
# main's tip off from its parents, so the dry run fails with "refusing
# to merge unrelated histories" for any branch behind main and passes
# only for one already up to date with it.
- name: Check main merges into PR
if: steps.parse.outputs.save == 'true' && steps.parse.outputs.framework != ''
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main --depth=1
git fetch origin main
if ! git merge --no-commit --no-ff origin/main; then
git merge --abort 2>/dev/null || true
gh pr comment "${{ steps.parse.outputs.pr }}" \
Expand Down Expand Up @@ -296,7 +300,7 @@ jobs:
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main --depth=1
git fetch origin main
if ! git merge --no-commit --no-ff origin/main; then
git merge --abort 2>/dev/null || true
gh pr comment "${{ steps.parse.outputs.pr }}" \
Expand Down Expand Up @@ -415,7 +419,7 @@ jobs:
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main --depth=1
git fetch origin main
if ! git merge --no-commit --no-ff origin/main; then
git merge --abort 2>/dev/null || true
gh pr comment "${{ steps.parse.outputs.pr }}" \
Expand Down