From 5c5961a4d403be5f4df7203709848c049fa4e212 Mon Sep 17 00:00:00 2001 From: makspll Date: Thu, 14 Aug 2025 23:42:53 +0100 Subject: [PATCH 1/4] fix bencher thresholds --- xtask/src/main.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 9a43771d62..e7c439717d 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1428,6 +1428,15 @@ impl Xtasks { .args(["--threshold-upper-boundary", "0.99"]) .args(["--thresholds-reset"]); + if !is_main { + bencher_cmd + .args(["--branch", &branch]) + .args(["--start-point", "main"]) + .args(["--start-point-hash", "main"]) + .args(["--start-point-clone-thresholds"]) + .args(["--start-point-reset"]); + } + if let Some(token) = &github_token { bencher_cmd.args(["--github-actions", token]); } From 0e437c8714f3a3d652a4affae6e81e6809da922a Mon Sep 17 00:00:00 2001 From: makspll Date: Fri, 15 Aug 2025 09:15:29 +0100 Subject: [PATCH 2/4] undo --- xtask/src/main.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index e7c439717d..9a43771d62 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1428,15 +1428,6 @@ impl Xtasks { .args(["--threshold-upper-boundary", "0.99"]) .args(["--thresholds-reset"]); - if !is_main { - bencher_cmd - .args(["--branch", &branch]) - .args(["--start-point", "main"]) - .args(["--start-point-hash", "main"]) - .args(["--start-point-clone-thresholds"]) - .args(["--start-point-reset"]); - } - if let Some(token) = &github_token { bencher_cmd.args(["--github-actions", token]); } From e1d51e0d986a15ceb9a8d2f6c05982e809fba226 Mon Sep 17 00:00:00 2001 From: makspll Date: Mon, 18 Aug 2025 19:44:14 +0100 Subject: [PATCH 3/4] fix invalid fork detection on main pushes --- .github/workflows/bevy_mod_scripting.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bevy_mod_scripting.yml b/.github/workflows/bevy_mod_scripting.yml index ace5a467c8..a38a47a4fc 100644 --- a/.github/workflows/bevy_mod_scripting.yml +++ b/.github/workflows/bevy_mod_scripting.yml @@ -83,7 +83,10 @@ jobs: - name: Check if fork id: check-fork run: | - if [ "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then + if [[ "${{ github.ref_name }}" == "main" ]]; then + echo "Push to main, not a fork." + echo "is_fork=false" >> $GITHUB_OUTPUT + elif [ "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then echo "This is a forked repository." echo "is_fork=true" >> $GITHUB_OUTPUT else From b80a8f4e75aaf6f0c914f7f51a50e55844f4284e Mon Sep 17 00:00:00 2001 From: makspll Date: Mon, 18 Aug 2025 19:50:10 +0100 Subject: [PATCH 4/4] only do this on push events --- .github/workflows/bevy_mod_scripting.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bevy_mod_scripting.yml b/.github/workflows/bevy_mod_scripting.yml index a38a47a4fc..d5c2ffd51c 100644 --- a/.github/workflows/bevy_mod_scripting.yml +++ b/.github/workflows/bevy_mod_scripting.yml @@ -83,10 +83,7 @@ jobs: - name: Check if fork id: check-fork run: | - if [[ "${{ github.ref_name }}" == "main" ]]; then - echo "Push to main, not a fork." - echo "is_fork=false" >> $GITHUB_OUTPUT - elif [ "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then + if [ "${{ github.event_name }}" == "pull_request" && "${{ github.repository }}" != "${{ github.event.pull_request.head.repo.full_name }}" ]; then echo "This is a forked repository." echo "is_fork=true" >> $GITHUB_OUTPUT else