From 745d63725ef6b23ba69654c5341aa6a68beebe5b Mon Sep 17 00:00:00 2001 From: Richard Shadrach Date: Sat, 9 May 2026 11:26:51 -0400 Subject: [PATCH] Run code from main --- .github/workflows/process_results.yaml | 12 ++++++++++-- .github/workflows/run_asvs_2026_01_04.yaml | 10 +++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/process_results.yaml b/.github/workflows/process_results.yaml index e0546f51345..ed4d25ccfab 100644 --- a/.github/workflows/process_results.yaml +++ b/.github/workflows/process_results.yaml @@ -40,6 +40,14 @@ jobs: ref: "${{ env.BRANCH_NAME }}" path: asv-runner/ + # ci/ scripts are run from main, not from whatever stale copy lives + # on the storage branch. + - name: Checkout asv-runner main branch + uses: actions/checkout@v6 + with: + ref: main + path: asv-runner-code/ + # Idempotent migration from the legacy loose-files layout to compressed # tarballs. No-op once the tarballs exist. - name: Migrate legacy storage layout @@ -80,12 +88,12 @@ jobs: - name: Process ASV results run: | - python asv-runner/ci/process_results.py --input-path=asv_bench/ --output-path=asv-runner/data + python asv-runner-code/ci/process_results.py --input-path=asv_bench/ --output-path=asv-runner/data rm -rf asv-runner/docs mv asv_bench/html/ asv-runner/docs - name: Make issues for new regressions - run: python asv-runner/ci/make_issues.py --input-path=asv-runner/data + run: python asv-runner-code/ci/make_issues.py --input-path=asv-runner/data env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/run_asvs_2026_01_04.yaml b/.github/workflows/run_asvs_2026_01_04.yaml index dc85152e62c..7b388652062 100644 --- a/.github/workflows/run_asvs_2026_01_04.yaml +++ b/.github/workflows/run_asvs_2026_01_04.yaml @@ -47,6 +47,14 @@ jobs: ref: ${{ env.BRANCH_NAME }} path: asv-runner/ + # ci/ scripts are run from main, not from whatever stale copy lives + # on the storage branch. The storage branch is data-only. + - name: Checkout asv-runner main branch + uses: actions/checkout@v6 + with: + ref: main + path: asv-runner-code/ + - name: Claim next SHA id: claim run: | @@ -70,7 +78,7 @@ jobs: rm -rf data/results data/envs cd .. - sha="$(python3 asv-runner/ci/find_commit_to_run.py --input-path=asv-runner/data/ --repo-path=.)" + sha="$(python3 asv-runner-code/ci/find_commit_to_run.py --input-path=asv-runner/data/ --repo-path=.)" if [ "$sha" = "NONE" ]; then new_commit=no claimed=true