Skip to content

Commit a8d38e8

Browse files
authored
Fix process_results workflow failure (#132)
1 parent df3c339 commit a8d38e8

2 files changed

Lines changed: 12 additions & 60 deletions

File tree

.github/workflows/process_results.yaml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-24.04
2424
defaults:
2525
run:
26-
shell: bash -el {0}
26+
shell: bash -e {0}
2727
permissions:
2828
contents: write
2929
issues: write
@@ -40,27 +40,14 @@ jobs:
4040
ref: "${{ env.BRANCH_NAME }}"
4141
path: asv-runner/
4242

43-
# ci/ scripts are run from main, not from whatever stale copy lives
44-
# on the storage branch.
45-
- name: Checkout asv-runner main branch
43+
# ci/ scripts are run from the workflow's own ref (main on schedule,
44+
# whatever branch you choose on workflow_dispatch), not from whatever
45+
# stale copy lives on the storage branch.
46+
- name: Checkout asv-runner code
4647
uses: actions/checkout@v6
4748
with:
48-
ref: main
4949
path: asv-runner-code/
5050

51-
# Migrate from legacy loose uncompressed JSON/YAML files to per-file
52-
# zstd. Idempotent.
53-
- name: Migrate legacy storage layout
54-
run: |
55-
if [ -d asv-runner/data/results/asvrunner ]; then
56-
find asv-runner/data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
57-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
58-
fi
59-
if [ -d asv-runner/data/envs ]; then
60-
find asv-runner/data/envs -name '*.yml' -print0 |
61-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
62-
fi
63-
6451
- name: Setup Python
6552
uses: actions/setup-python@v6
6653
with:
@@ -122,17 +109,6 @@ jobs:
122109
git config user.name "github-actions[bot]"
123110
git config user.email "github-actions[bot]@users.noreply.github.com"
124111
125-
# Migrate from legacy loose uncompressed files to per-file zstd.
126-
# Idempotent.
127-
if [ -d data/results/asvrunner ]; then
128-
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
129-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
130-
fi
131-
if [ -d data/envs ]; then
132-
find data/envs -name '*.yml' -print0 |
133-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
134-
fi
135-
136112
# Restore our parquet+docs over the freshly fetched tree.
137113
rm -rf data/results.parquet docs
138114
cp -r "$SAVE/results.parquet" data/results.parquet

.github/workflows/run_asvs_2026_01_04.yaml

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-24.04
2828
defaults:
2929
run:
30-
shell: bash -el {0}
30+
shell: bash -e {0}
3131
permissions:
3232
contents: write
3333
outputs:
@@ -47,12 +47,12 @@ jobs:
4747
ref: ${{ env.BRANCH_NAME }}
4848
path: asv-runner/
4949

50-
# ci/ scripts are run from main, not from whatever stale copy lives
51-
# on the storage branch. The storage branch is data-only.
52-
- name: Checkout asv-runner main branch
50+
# ci/ scripts are run from the workflow's own ref (main on schedule,
51+
# whatever branch you choose on workflow_dispatch), not from whatever
52+
# stale copy lives on the storage branch. The storage branch is data-only.
53+
- name: Checkout asv-runner code
5354
uses: actions/checkout@v6
5455
with:
55-
ref: main
5656
path: asv-runner-code/
5757

5858
- name: Claim next SHA
@@ -68,19 +68,6 @@ jobs:
6868
git config user.name "github-actions[bot]"
6969
git config user.email "github-actions[bot]@users.noreply.github.com"
7070
71-
# Migrate from legacy loose uncompressed JSON/YAML files to
72-
# per-file zstd. Idempotent: subsequent runs find no *.json
73-
# (besides machine.json, excluded) or *.yml and the find
74-
# produces no input.
75-
if [ -d data/results/asvrunner ]; then
76-
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
77-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
78-
fi
79-
if [ -d data/envs ]; then
80-
find data/envs -name '*.yml' -print0 |
81-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
82-
fi
83-
8471
cd ..
8572
sha="$(python3 asv-runner-code/ci/find_commit_to_run.py --input-path=asv-runner/data/ --repo-path=.)"
8673
if [ "$sha" = "NONE" ]; then
@@ -129,7 +116,7 @@ jobs:
129116
runs-on: ubuntu-24.04
130117
defaults:
131118
run:
132-
shell: bash -el {0}
119+
shell: bash -e {0}
133120
env:
134121
SHA: ${{ needs.claim.outputs.sha }}
135122
steps:
@@ -186,7 +173,7 @@ jobs:
186173
runs-on: ubuntu-24.04
187174
defaults:
188175
run:
189-
shell: bash -el {0}
176+
shell: bash -e {0}
190177
permissions:
191178
contents: write
192179
env:
@@ -213,17 +200,6 @@ jobs:
213200
git config user.name "github-actions[bot]"
214201
git config user.email "github-actions[bot]@users.noreply.github.com"
215202
216-
# Migrate from legacy loose uncompressed files to per-file zstd.
217-
# Idempotent.
218-
if [ -d data/results/asvrunner ]; then
219-
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
220-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
221-
fi
222-
if [ -d data/envs ]; then
223-
find data/envs -name '*.yml' -print0 |
224-
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
225-
fi
226-
227203
# Drop in this run's new files.
228204
mkdir -p data/results/asvrunner data/envs
229205
cp /tmp/new/results/benchmarks.json data/results/

0 commit comments

Comments
 (0)