Skip to content

Commit 054c072

Browse files
authored
Merge pull request #43 from MDA2AV/fix/benchmark-rebase-race
ci: fix benchmark race when main moves ahead during run
2 parents 1f4a592 + 52fe339 commit 054c072

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/benchmark.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ jobs:
6464
git add site/data/ site/static/logs/ 2>/dev/null || true
6565
if ! git diff --cached --quiet; then
6666
branch="benchmark-results/$(date +%Y%m%d-%H%M%S)"
67-
git checkout -b "$branch"
67+
git fetch origin main
68+
git checkout -b "$branch" origin/main
69+
git checkout HEAD@{1} -- site/data/ site/static/logs/
6870
git commit -m "benchmark: update results for ${{ steps.detect.outputs.list }}"
6971
git push -u origin "$branch"
7072
gh pr create \

0 commit comments

Comments
 (0)