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
34 changes: 5 additions & 29 deletions .github/workflows/process_results.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-24.04
defaults:
run:
shell: bash -el {0}
shell: bash -e {0}
permissions:
contents: write
issues: write
Expand All @@ -40,27 +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
# ci/ scripts are run from the workflow's own ref (main on schedule,
# whatever branch you choose on workflow_dispatch), not from whatever
# stale copy lives on the storage branch.
- name: Checkout asv-runner code
uses: actions/checkout@v6
with:
ref: main
path: asv-runner-code/

# Migrate from legacy loose uncompressed JSON/YAML files to per-file
# zstd. Idempotent.
- name: Migrate legacy storage layout
run: |
if [ -d asv-runner/data/results/asvrunner ]; then
find asv-runner/data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi
if [ -d asv-runner/data/envs ]; then
find asv-runner/data/envs -name '*.yml' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi

- name: Setup Python
uses: actions/setup-python@v6
with:
Expand Down Expand Up @@ -122,17 +109,6 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

# Migrate from legacy loose uncompressed files to per-file zstd.
# Idempotent.
if [ -d data/results/asvrunner ]; then
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi
if [ -d data/envs ]; then
find data/envs -name '*.yml' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi

# Restore our parquet+docs over the freshly fetched tree.
rm -rf data/results.parquet docs
cp -r "$SAVE/results.parquet" data/results.parquet
Expand Down
38 changes: 7 additions & 31 deletions .github/workflows/run_asvs_2026_01_04.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-24.04
defaults:
run:
shell: bash -el {0}
shell: bash -e {0}
permissions:
contents: write
outputs:
Expand All @@ -47,12 +47,12 @@ 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
# ci/ scripts are run from the workflow's own ref (main on schedule,
# whatever branch you choose on workflow_dispatch), not from whatever
# stale copy lives on the storage branch. The storage branch is data-only.
- name: Checkout asv-runner code
uses: actions/checkout@v6
with:
ref: main
path: asv-runner-code/

- name: Claim next SHA
Expand All @@ -68,19 +68,6 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

# Migrate from legacy loose uncompressed JSON/YAML files to
# per-file zstd. Idempotent: subsequent runs find no *.json
# (besides machine.json, excluded) or *.yml and the find
# produces no input.
if [ -d data/results/asvrunner ]; then
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi
if [ -d data/envs ]; then
find data/envs -name '*.yml' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi

cd ..
sha="$(python3 asv-runner-code/ci/find_commit_to_run.py --input-path=asv-runner/data/ --repo-path=.)"
if [ "$sha" = "NONE" ]; then
Expand Down Expand Up @@ -129,7 +116,7 @@ jobs:
runs-on: ubuntu-24.04
defaults:
run:
shell: bash -el {0}
shell: bash -e {0}
env:
SHA: ${{ needs.claim.outputs.sha }}
steps:
Expand Down Expand Up @@ -186,7 +173,7 @@ jobs:
runs-on: ubuntu-24.04
defaults:
run:
shell: bash -el {0}
shell: bash -e {0}
permissions:
contents: write
env:
Expand All @@ -213,17 +200,6 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

# Migrate from legacy loose uncompressed files to per-file zstd.
# Idempotent.
if [ -d data/results/asvrunner ]; then
find data/results/asvrunner -name '*.json' ! -name 'machine.json' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi
if [ -d data/envs ]; then
find data/envs -name '*.yml' -print0 |
xargs -0 -r -P 4 -n 50 zstd --rm -19 -q
fi

# Drop in this run's new files.
mkdir -p data/results/asvrunner data/envs
cp /tmp/new/results/benchmarks.json data/results/
Expand Down
Loading