Skip to content

Revert "bk: run faster builds"#7038

Merged
ebeahan merged 3 commits into
mainfrom
revert-7029-feature/support-faster-builds-load
May 20, 2026
Merged

Revert "bk: run faster builds"#7038
ebeahan merged 3 commits into
mainfrom
revert-7029-feature/support-faster-builds-load

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented May 14, 2026

Reverts #7029

As long as the post-checkout does some logic this cannot be used.

In theory, the BK PR bot could be the solution, and could help to remove all the post-checkout logics required to always test PRs with the merge, but I dont' think it's available yet that feature

@v1v v1v requested a review from a team as a code owner May 14, 2026 19:44
@v1v v1v requested review from swiatekm and ycombinator May 14, 2026 19:44
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented May 14, 2026

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@ebeahan ebeahan added backport-skip Skip notification from the automated backport with mergify skip-changelog labels May 14, 2026
@ebeahan
Copy link
Copy Markdown
Member

ebeahan commented May 14, 2026

I also reverted #7037, since its purpose was to try to fix the changes from #7029.

Copy link
Copy Markdown
Member

@ebeahan ebeahan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we may not need to revert. Synthetics are now running again: https://buildkite.com/elastic/gpctl-promote-after-serverless-devenv-synthetics/builds/43741

Let me validate before we merge.

@v1v
Copy link
Copy Markdown
Member Author

v1v commented May 20, 2026

I think we need to rebump this.

The current checkout process with the post-checkout step is not working as expected:

HEAD is now at ab3b3a1 chore: Update snapshot.yml (#7060)
--
  | Current branch: HEAD
  | Switched to a new branch 'pr_merge_7068'
  | New branch created: pr_merge_7068
  | fatal: refusing to merge unrelated histories
  | Merge failed: 128
  | fatal: There is no merge to abort (MERGE_HEAD missing).

I'm not much familiar with the post-checkout script, but it's causing some issues when using the spare-checkout.

One solution could be to add a condition in the post-checkout so it does not run when running the upload command

@v1v v1v requested a review from ebeahan May 20, 2026 13:59
@ebeahan ebeahan merged commit 11bb5ee into main May 20, 2026
12 checks passed
@ebeahan ebeahan deleted the revert-7029-feature/support-faster-builds-load branch May 20, 2026 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Skip notification from the automated backport with mergify skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants