vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source 
Also removes the debugging step again.

Release Notes:

- N/A
This commit is contained in:
Finn Evers 2026-02-24 19:37:20 +01:00 committed by GitHub
parent 3873cd0b5d
commit 273a6cb00d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/extension_bump.yml vendored
View file

@ -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"

8
.github/workflows/extension_tests.yml vendored
View file

@ -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"
@ -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:

2
tooling/xtask/src/tasks/workflows/extension_bump.rs
View file

@ -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"

14
tooling/xtask/src/tasks/workflows/extension_tests.rs
View file

@ -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",