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 minor (backport #12233) #12366

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

This is an automatic backport of pull request #12233 done by Mergify.
Cherry-pick of 7f98e30 has failed:

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

You are currently cherry-picking commit 7f98e30ff.
  (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)

Changes to be committed:
	new file:   .github/workflows/prepare-release/action.yml
	new file:   release.mk

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

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

* ci(release): automate release steps

* refactor a bit

* report non supported versions

* rename make goals and add some docs

* cosmetic changes in the slack messages

* support slack threads

* fix

* chore

* chore

* refactor: patch

* refactor: minor

* fix

* use slack channel env

* use output slack-thread

* avoid concurrency

* support full checkout and validaitons

* notify what's the error if any failure

* fix

* chore

* initial

* exclude

* chore

* enable mergify and yq

* update mergify if required

* Revert "update mergify if required"

This reverts commit 299e6d8.

* update mergify if required

* use RELEASE_BRANCH

add create make goal

* fix

* support prs

* run only if things were created correctly

* fix

* force branch

* refactor

* refactor

* github warn

* enable

* set makefile and use variable

* fix

* fix

* create head

* update changelog

* replace compare

* modify

* partial

* fix

* fix

* refactor

* docs

* test

* action: grant permissions

* notify if failrues

* use base branch

* fix hardcoded value

* remove leaving directory

* cannot user github bot to create PRs

* chore

* enable

* chore

* fix

* production

* use release version

* support for #12251

---------

Co-authored-by: Silvia Mitter <[email protected]>
Co-authored-by: Carson Ip <[email protected]>
(cherry picked from commit 7f98e30)

# Conflicts:
#	.github/workflows/run-minor-release.yml
#	.github/workflows/run-patch-release.yml
#	.gitignore
#	Makefile
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 8, 2024
@mergify mergify bot assigned v1v Jan 8, 2024
Copy link
Contributor Author

mergify bot commented Jan 8, 2024

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

Copy link
Contributor Author

mergify bot commented Jan 9, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.17/pr-12233 upstream/mergify/bp/7.17/pr-12233
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-12233

@v1v v1v closed this Jan 9, 2024
@v1v v1v deleted the mergify/bp/7.17/pr-12233 branch January 9, 2024 15:03
@v1v v1v restored the mergify/bp/7.17/pr-12233 branch January 9, 2024 15:08
@v1v v1v reopened this Jan 9, 2024
Copy link
Contributor Author

mergify bot commented Jan 9, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.17/pr-12233 upstream/mergify/bp/7.17/pr-12233
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-12233

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jan 9, 2024
.gitignore Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@v1v v1v enabled auto-merge (squash) January 9, 2024 15:32
@v1v
Copy link
Member

v1v commented Jan 10, 2024

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Jan 10, 2024

update

☑️ Nothing to do

  • #commits-behind>0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]

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 v1v closed this Jan 15, 2024
auto-merge was automatically disabled January 15, 2024 15:24

Pull request was closed

@mergify mergify bot deleted the mergify/bp/7.17/pr-12233 branch January 15, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant