Skip to content

fix(nightly): the resolved build commit carries the tip's scripts/ci/nightly-steps #31121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lawrencecchen merged 3 commits into from
Nov 1, 2026
Merged

fix(nightly): the resolved build commit carries the tip's scripts/ci/nightly-steps #31121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
349227f
test(nightly): the resolver refuses a published commit whose nightly …
lawrencecchen Nov 1, 2026
24a7029
fix(nightly): the resolved build commit carries the tip's scripts/ci/…
lawrencecchen Nov 1, 2026
9fed58b
Merge remote-tracking branch 'origin/feat-cmux-next' into fix/nightly…
lawrencecchen Nov 1, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@ jobs:
env:
CMUX_TUI_TREE_SEARCH_COMMITS: "50"
CMUX_TUI_TREE_MAX_AGE_HOURS: "24"
CMUX_TUI_TREE_SAME_PATHS: .github/workflows/nightly.yml Native/OptChat/optchat-chief/Cargo.lock
CMUX_TUI_TREE_SAME_PATHS: .github/workflows/nightly.yml Native/OptChat/optchat-chief/Cargo.lock scripts/ci/nightly-steps
GH_TOKEN: ${{ github.token }}
run: bash scripts/ci/nightly-steps/resolve-cmux-tui-client-commit.sh

Expand Down
3 changes: 2 additions & 1 deletion scripts/ci/nightly-steps/resolve-cmux-tui-client-commit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
# commit, so the resolved commit must carry the same file: run
# 37568319518 called a dSYM script its older build commit lacked.
# Preserve Chief lockfile repairs too: run 37724899486 selected an
# older published revision and failed cargo build --locked.
# older published revision and failed cargo build --locked. The step
# scripts the workflow calls from that checkout must be the tip's (#30912).
set -euo pipefail
# Prints commit=, key=, source_commit=, tip_key=, behind= and
# behind_hours= lines and writes them to the step summary.
Expand Down
21 changes: 21 additions & 0 deletions scripts/cmux-next/tests/pin-cmux-tui-resolve-newest.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,27 @@ resolve CMUX_TUI_TREE_MAX_AGE_HOURS=48 "CMUX_TUI_TREE_SAME_PATHS=$nightly_same_p
[[ "$status" == 0 ]] && grep -qx "source_commit=$repaired" <<<"$out" \
|| fail "nightly must resolve the published revision with the repaired Chief lockfile (exit $status):" "$out" "$err"

# The nightly's step scripts (#30912, #31013) run from the resolved commit's checkout under the
# tip's workflow: a published commit whose scripts/ci/nightly-steps differ from the tip's would run
# an older copy of a step the tip's workflow names. The workflow's own policy refuses it.
step=scripts/ci/nightly-steps/example-step.sh
mkdir -p "$src/$(dirname "$step")"
echo "echo old step" > "$src/$step"
git_q -C "$src" add -A; GIT_COMMITTER_DATE="@$future +0000" git_q -C "$src" commit -m "old step script"
publish "$(git -C "$src" rev-parse HEAD)" ""
echo "echo new step" > "$src/$step"
echo five-b > "$src/cmux-tui/a"
git_q -C "$src" add -A; GIT_COMMITTER_DATE="@$future +0000" git_q -C "$src" commit -m "new step script and tui"
new_step=$(git -C "$src" rev-parse HEAD)
resolve CMUX_TUI_TREE_MAX_AGE_HOURS=48 "CMUX_TUI_TREE_SAME_PATHS=$nightly_same_paths"
[[ "$status" != 0 ]] || fail "nightly must not resolve a published revision with an older nightly step script, got:" "$out"
grep -q "scripts/ci/nightly-steps differs from the tip" <<<"$err" \
|| fail "the stale step script refusal needs a clear message:" "$err"
publish "$new_step" ""
resolve CMUX_TUI_TREE_MAX_AGE_HOURS=48 "CMUX_TUI_TREE_SAME_PATHS=$nightly_same_paths"
[[ "$status" == 0 ]] && grep -qx "source_commit=$new_step" <<<"$out" \
|| fail "nightly must resolve the published revision with the tip's step scripts (exit $status):" "$out" "$err"

# No Mac Release compile is required (#25786): nightly-next run 40427307041
# failed here because fb384d011b85, the only commit in its window with a
# published tree, had no green "cmux-next Release compile (Xcode 26)". With
Expand Down
Loading