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

Release v0.3.0 against new branch #1133

Merged
merged 5 commits into from
Oct 23, 2024
Merged

Conversation

HCastano
Copy link
Collaborator

@HCastano HCastano commented Oct 23, 2024

In #1129 I made a new base branch for the release called release/v0.3.0. This caused a problem since that's the naming convention we used for tags, creating an ambiguous situation for Git. What I should've done was named the branch release-v0.3.0 (note the dash instead of the backslash).

While I could push forward and have a tag and branch with the same name I figured it would be better to address this by making a new PR targeting a non-conflicting base branch. I'm gonna have to delete the base branch for #1129 eventually, so note that the diff there might look a little wonky.

There are no code differences between this and #1129.

@HCastano HCastano merged commit 98231d4 into release-v0.3.x Oct 23, 2024
16 checks passed
@HCastano HCastano deleted the hc/release-v0.3.0 branch October 23, 2024 15:01
HCastano added a commit that referenced this pull request Nov 8, 2024
* Bump version from to `v0.3.0`

* Update `CHANGELOG`

This updates the info for the full release as well as includes a missed breaking change.

* Use released version of `tdx-quote`

* Get rid of warning when building tests

* Update `Unreleased` section link
HCastano added a commit that referenced this pull request Nov 11, 2024
* Release `v0.3.0` against new branch (#1133)

* Bump version from to `v0.3.0`

* Update `CHANGELOG`

This updates the info for the full release as well as includes a missed breaking change.

* Use released version of `tdx-quote`

* Get rid of warning when building tests

* Update `Unreleased` section link

* TaploFmt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants