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

fix(ci): fix release CI to work with release branches #206

Merged
merged 3 commits into from
Apr 23, 2024

Conversation

pmalek
Copy link
Member

@pmalek pmalek commented Apr 23, 2024

What this PR does / why we need it:

This fixes the release pipeline to make it work with release branches.

Up until now the .github/workflows/release-bot.yaml was only triggered on main and .github/workflows/__release-workflow.yaml was only creating release PRs against main. That caused 1.2.2 to be released on main which we did not want (due to that branch already including a breaking change which we did not want to include in 1.2.x).

This change makes the release workflow to accept a base branch argument so that we can release from release branches.

Ideally the VERSION and manifests would also get an update on main but that can be done separately.

This also retracts the 1.2.2 tag since it was not created on a desired SHA. Deleting and re-pushing the tag does not help because golang's proxy caches modules indefinitely (https://sum.golang.org/#faq-retract-version) hence the retract clause added in go.mod.

@pmalek pmalek self-assigned this Apr 23, 2024
@pmalek pmalek requested a review from a team as a code owner April 23, 2024 12:47
@pmalek
Copy link
Member Author

pmalek commented Apr 23, 2024

@programmer04 PTAL: I've included the changes 159aa8c
to trigger a PR against main as well when a release on release branch is created.

@pmalek pmalek merged commit bf8ef3a into main Apr 23, 2024
13 checks passed
@pmalek pmalek deleted the fix-release-pipeline-for-release-branches branch April 23, 2024 13:30
pmalek added a commit that referenced this pull request Apr 23, 2024
* fix(ci): fix release CI to work with release branches

* fix(ci): trigger a PR against main when a release on a release branch is created

* chore: go mod tidy
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.

2 participants