Resolve benchmark.yml pin conflict for dev→main merge - #25
Merged
Conversation
Runs pyakima.demos.speed_demo on ubuntu/windows/macos runners via workflow_dispatch and uploads each runner's stdout as a .txt artifact (named under docs/benchmarks/). scipy is installed on all OSes; the GSL backend is a best-effort Linux-only step. Manual-only since hosted-runner timings are noisy and not a merge gate. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Add manual cross-OS speed_demo benchmark workflow
Both branches added .github/workflows/benchmark.yml; dev carries the newer Action pins (checkout@v7, setup-uv@v7, upload-artifact@v7) from PR #19. Resolved by keeping dev's version. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> # Conflicts: # .github/workflows/benchmark.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Unblocks the release-candidate PR #24 (
dev→main), which is stuck on an add/add conflict in.github/workflows/benchmark.yml.Both
main(from PR #15) anddev(bumped in PR #19) independently added that workflow, with only the Action pin versions differing:actions/checkoutastral-sh/setup-uvactions/upload-artifactThis branch merges
mainintodevand resolves the conflict by keeping dev's newer pins (the intended state from PR #19). The resulting tree is byte-identical todevbefore the merge — the only change is merge topology so the branches share history.Once this lands on
dev, PR #24 becomes conflict-free and CI can run.