Skip to content

extension_ci: Remove merge-base fork-point flag in version check #50014

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
MrSubidubi merged 1 commit into from
Feb 24, 2026
Merged

extension_ci: Remove merge-base fork-point flag in version check #50014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/extension_bump.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')"

if [[ "${{ github.event_name }}" == "pull_request" ]]; then
PR_FORK_POINT="$(git merge-base --fork-point origin/main HEAD)"
PR_FORK_POINT="$(git merge-base origin/main HEAD)"
git checkout "$PR_FORK_POINT"
elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
git checkout "$BRANCH_PARENT_SHA"
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/extension_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
CURRENT_VERSION="$(sed -n 's/^version = \"\(.*\)\"/\1/p' < extension.toml | tr -d '[:space:]')"

if [[ "${{ github.event_name }}" == "pull_request" ]]; then
PR_FORK_POINT="$(git merge-base --fork-point origin/main HEAD)"
PR_FORK_POINT="$(git merge-base origin/main HEAD)"
git checkout "$PR_FORK_POINT"
elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
git checkout "$BRANCH_PARENT_SHA"
Expand All @@ -137,12 +137,6 @@ jobs:
echo "Version changes happen in separate PRs and will be performed by the zed-zippy bot"
exit 42
fi
- name: extension_tests::breakpoint
if: failure()
uses: namespacelabs/breakpoint-action@ca62bf12510ebf1115a560cf337a35fad5eb052b
with:
duration: 15m
authorized-users: MrSubidubi
timeout-minutes: 6
tests_pass:
needs:
Expand Down
2 changes: 1 addition & 1 deletion tooling/xtask/src/tasks/workflows/extension_bump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pub(crate) fn compare_versions() -> (Step<Run>, StepOutput, StepOutput) {
CURRENT_VERSION="$({VERSION_CHECK})"

if [[ "${{{{ github.event_name }}}}" == "pull_request" ]]; then
PR_FORK_POINT="$(git merge-base --fork-point origin/main HEAD)"
PR_FORK_POINT="$(git merge-base origin/main HEAD)"
git checkout "$PR_FORK_POINT"
elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
git checkout "$BRANCH_PARENT_SHA"
Expand Down
14 changes: 1 addition & 13 deletions tooling/xtask/src/tasks/workflows/extension_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,11 @@ pub(crate) fn check_extension() -> NamedJob {
.add_step(cache_rust_dependencies_namespace()) // Extensions can compile Rust, so provide the cache if needed.
.add_step(check())
.add_step(check_version_job)
.add_step(verify_version_did_not_change(version_changed))
.add_step(breakpoint());
.add_step(verify_version_did_not_change(version_changed));

named::job(job)
}

fn breakpoint() -> Step<Use> {
named::uses(
"namespacelabs",
"breakpoint-action",
"ca62bf12510ebf1115a560cf337a35fad5eb052b",
)
.if_condition(Expression::new("failure()"))
.add_with(("duration", "15m"))
.add_with(("authorized-users", "MrSubidubi"))
}

pub fn cache_zed_extension_cli() -> (Step<Use>, StepOutput) {
let step = named::uses(
"actions",
Expand Down