Skip to content

[Fix] Discard generated JNI changes before PR benchmark checkout - #151

Merged
stephen29xie merged 1 commit into
mainfrom
fix/java-benchmark-checkout
Oct 16, 2026
Merged

stephen29xie merged 1 commit into
mainfrom
fix/java-benchmark-checkout

Conversation

@stephen29xie

Copy link
Copy Markdown
Collaborator

Description

Fix Java benchmark jobs failing when switching from the base revision to the PR revision. The base build regenerates a tracked JNI header, and Git refuses to overwrite it when the PR changes that header. Both benchmark jobs hit this in #140.

Changes Made

Use git checkout --force when switching to the PR revision in the disposable CI workspace. This discards generated changes from the base build. The next step cleans and rebuilds the PR revision; saved baseline results remain outside the checkout.

Additional Comments

Benchmark settings and library behavior are unchanged.

@stephen29xie
stephen29xie marked this pull request as ready for review October 16, 2026 20:28
@stephen29xie
stephen29xie merged commit 962bb5e into main Oct 16, 2026
53 checks passed
@stephen29xie
stephen29xie deleted the fix/java-benchmark-checkout branch October 16, 2026 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants