Skip to content

1.4.1 sync to 1.4.x#3868

Closed
kisunji wants to merge 5 commits intorelease/1.4.xfrom
release/1.4.1
Closed

1.4.1 sync to 1.4.x#3868
kisunji wants to merge 5 commits intorelease/1.4.xfrom
release/1.4.1

Conversation

@kisunji
Copy link
Contributor

@kisunji kisunji commented Apr 3, 2024

Remaking this PR because a GHA job was stuck

Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Checklist

Chris S. Kim and others added 5 commits March 27, 2024 09:51
@kisunji kisunji added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Apr 3, 2024
@kisunji kisunji requested a review from zalimeni April 3, 2024 23:08
Copy link
Member

@zalimeni zalimeni left a comment

Choose a reason for hiding this comment

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

I think we're pulling in a few too many changes on this one. I'm also not 100% certain that GH wouldn't auto-delete the release/1.4.1 branch after this is merged - but given we need a subset, we're probably looking at a distinct PR branch regardless.

Looking at release/1.4.x...release/1.4.1, I think we just need the troubleshoot bump, changelog, and CE test flag addition? (the vault/api CVE fix #3837 was already backported to 1.4.x)

I just realized we did the same for 1.3.x, 1.2.x, and 1.1.x in #3823, #3822, and #3821 (sorry I missed the extra commits in those). I went ahead and merged the new PRs you opened to reset the dev versions there, but I think we can do it all in one PR for this branch since we haven't synced anything yet.

Comment on lines +29 to +30
# set "test-ce" to false when a new minor version is released
inputs: '{ "test-ce": true, "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
Copy link
Member

Choose a reason for hiding this comment

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

This one should be false already since it corresponds to CE 1.15 (not 1.18), right?


apiVersion: v2
name: consul
version: 1.4.1-dev
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: we won't want to reset these versions on .x (point-release specific changes)

// then it means that it is a final release. Otherwise, this is a pre-release
// such as "dev" (in development), "beta", "rc1", etc.
VersionPrerelease = "dev"
VersionPrerelease = ""
Copy link
Member

Choose a reason for hiding this comment

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

Ditto re: retaining dev on .x

# ```
# @default: hashicorp/consul:<latest version>
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.18-dev
image: hashicorp/consul:1.18.1
Copy link
Member

Choose a reason for hiding this comment

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

Ditto re: retaining dev on .x

// then it means that it is a final release. Otherwise, this is a pre-release
// such as "dev" (in development), "beta", "rc1", etc.
VersionPrerelease = "dev"
VersionPrerelease = ""
Copy link
Member

Choose a reason for hiding this comment

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

Ditto re: retaining dev on .x

@kisunji
Copy link
Contributor Author

kisunji commented Apr 4, 2024

I think we're pulling in a few too many changes on this one. I'm also not 100% certain that GH wouldn't auto-delete the release/1.4.1 branch after this is merged - but given we need a subset, we're probably looking at a distinct PR branch regardless.

Looking at release/1.4.x...release/1.4.1, I think we just need the troubleshoot bump, changelog, and CE test flag addition? (the vault/api CVE fix #3837 was already backported to 1.4.x)

I just realized we did the same for 1.3.x, 1.2.x, and 1.1.x in #3823, #3822, and #3821 (sorry I missed the extra commits in those). I went ahead and merged the new PRs you opened to reset the dev versions there, but I think we can do it all in one PR for this branch since we haven't synced anything yet.

Got it - I originally thought we wanted these point releases to be "pure" (i.e. HEAD should be the tagged commit). So I was planning on the followup PR for this as well, but if we don't really care then it's more convenient to batch things up on this branch.

I'm pretty sure GH won't autodelete these branches because they are protected

@kisunji kisunji mentioned this pull request Apr 4, 2024
2 tasks
@kisunji kisunji closed this Apr 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants