Skip to content
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.

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

[7.17] ci(release): automate release steps for the patch (backport #12273) #12397

Merged
merged 6 commits into from
Jan 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2024

This is an automatic backport of pull request #12273 done by Mergify.
Cherry-pick of 1b36392 has failed:

On branch mergify/bp/7.17/pr-12273
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 1b3639226.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/run-patch-release.yml
	deleted by us:   release.mk

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 1b36392)

# Conflicts:
#	.github/workflows/run-patch-release.yml
#	release.mk
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 11, 2024
@mergify mergify bot assigned v1v Jan 11, 2024
.github/workflows/run-patch-release.yml Outdated Show resolved Hide resolved
.github/workflows/run-patch-release.yml Outdated Show resolved Hide resolved
@v1v
Copy link
Member

v1v commented Jan 11, 2024

Requires #12366

Copy link
Contributor Author

mergify bot commented Jan 15, 2024

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

@v1v
Copy link
Member

v1v commented Jan 15, 2024

This PR also contains the changes from #12366

@v1v
Copy link
Member

v1v commented Jan 17, 2024

I reverted 9c06696 so I can verify if the lint works nicely rather than failing dramatically.

And it did work as expected -> https://github.com/elastic/apm-server/actions/runs/7559406648/job/20583139806?pr=12397

@v1v
Copy link
Member

v1v commented Jan 18, 2024

run elasticsearch-ci/docs

@v1v v1v enabled auto-merge (squash) January 18, 2024 13:43
@v1v
Copy link
Member

v1v commented Jan 18, 2024

I'll create a specific PR with the reverted changes in #12397 (comment)

@mergify mergify bot merged commit 7bfdded into 7.17 Jan 18, 2024
15 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-12273 branch January 18, 2024 14:21
v1v added a commit that referenced this pull request Jan 18, 2024
…12445

* upstream/7.17:
  [7.17] ci(release): automate release steps for the patch (backport #12273) (#12397)
  ci(package): fix version for 7.17 (#12450)
v1v referenced this pull request in v1v/apm-server Jan 18, 2024
@v1v v1v mentioned this pull request Jan 18, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant