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 v3.5 patch releases discussion #11997

Open
terrytangyuan opened this issue Oct 14, 2023 · 79 comments
Open

Release v3.5 patch releases discussion #11997

terrytangyuan opened this issue Oct 14, 2023 · 79 comments
Labels
type/feature Feature request

Comments

@terrytangyuan
Copy link
Member

terrytangyuan commented Oct 14, 2023

This issue tracks commits for 3.5 patch releases.

@terrytangyuan
Copy link
Member Author

#12025 needs to be fixed for this

@terrytangyuan terrytangyuan changed the title Release v3.5.1 cherry-pick candidates Release v3.5 patch releases discussion Oct 23, 2023
@terrytangyuan
Copy link
Member Author

I am thinking about releasing v3.5.1 next week. The most important fix would be #12068 since it blocks people from upgrading to v3.5.

@terrytangyuan
Copy link
Member Author

Security fix: #12111

@terrytangyuan
Copy link
Member Author

#12130

@terrytangyuan
Copy link
Member Author

terrytangyuan commented Nov 3, 2023

Released: https://github.com/argoproj/argo-workflows/releases/tag/v3.5.1

@agilgur5
Copy link
Member

agilgur5 commented Nov 5, 2023

Would be good to get my UI code-splitting / bundle reductions changes into the next patch release once they're all merged in (#12061, #12097, #12150). They are primarily refactors in content, but their overall intent is to fix long wait times for the UI on slow networks or slow devices as described in #11970

@terrytangyuan
Copy link
Member Author

#12133

@terrytangyuan
Copy link
Member Author

#12203

@terrytangyuan
Copy link
Member Author

TODO: @terrytangyuan to post a list of commits to cherry-pick here

@terrytangyuan
Copy link
Member Author

terrytangyuan commented Nov 22, 2023

The plan is to cherry-pick the following commits (unless there's conflict) for v3.5.2 release

Fixes:

Tests:

Chore(deps):

Others:

@Joibel
Copy link
Member

Joibel commented Nov 22, 2023

Could you add #12215 and #12214 to 3.5.2 please @terrytangyuan, just to ensure those tests are happening.

@agilgur5
Copy link
Member

agilgur5 commented Nov 23, 2023

Could we add the UI code-splitting PRs as I mentioned above? I don't think they have a big impact to that many users, so I'm fine with it going in 3.5.3 instead if you'd prefer to keep 3.5.2 smaller/more stable.

Otherwise commit list LGTM ✅

@terrytangyuan
Copy link
Member Author

@Joibel Good idea.

@agilgur5 I'd like to focus on fixes and chore(deps) in patch releases.

@agilgur5
Copy link
Member

agilgur5 commented Nov 23, 2023

As I wrote above:

They are primarily refactors in content, but their overall intent is to fix long wait times for the UI on slow networks or slow devices as described in #11970

I would definitely not call them features at least

@agilgur5
Copy link
Member

agilgur5 commented Nov 23, 2023

We probably want #12245 as well since #12225 and #12227 are in the list and may break lint again on the 3.5.x branch

@terrytangyuan
Copy link
Member Author

I would definitely not call them features at least

Sounds good. In the future, let's make sure the PR titles can tell us that.

@agilgur5
Copy link
Member

agilgur5 commented Nov 23, 2023

Yea each PR individually is more of a refactor, but as a whole they are a fix -- in other words, a bunch of refactors that enable a fix.
Naming things is a hard problem 😅 ; as always feel free to change the titles if that makes things easier for you to release

@terrytangyuan
Copy link
Member Author

terrytangyuan commented Nov 27, 2023

Working on branch https://github.com/argoproj/argo-workflows/tree/release-3.5.2

Note that I also included some merged dependabot PRs from master branch and some of the dependabot PRs cannot be cherry-picked.

@terrytangyuan
Copy link
Member Author

terrytangyuan commented Nov 27, 2023

@juliev0
Copy link
Contributor

juliev0 commented Dec 13, 2023

Request to include #12353

@terrytangyuan
Copy link
Member Author

This needs to be included #12470

@agilgur5
Copy link
Member

agilgur5 commented Jan 7, 2024

#12421 is also a fix for a 3.5.0 feature

@sarabala1979
Copy link
Member

Hi
I am working on release v3.5.3 which includes below PRs
#12421
#12470
#12353

@agilgur5
Copy link
Member

Updating here that 3.5.3 was released

@agilgur5
Copy link
Member

#12397 for the next release

@terrytangyuan
Copy link
Member Author

You should be able to create a tag now.

@terrytangyuan
Copy link
Member Author

https://github.com/argoproj/argo-workflows/releases/tag/v3.5.5

Thanks @agilgur5 and @isubasinghe!

@z63d
Copy link

z63d commented Mar 21, 2024

Would you consider cherry-picking #12312 into the v3.5 release branch? You can find more details in #12829.

@agilgur5
Copy link
Member

Would you consider cherry-picking #12312 into the v3.5 release branch?

Completed in #12312 (comment)

@agilgur5 agilgur5 added this to the v3.5.x patches milestone Apr 3, 2024
@yulin-li
Copy link
Contributor

yulin-li commented Apr 6, 2024

could we make a patch release for recent CVE fixes?

@terrytangyuan
Copy link
Member Author

Yes, we should release a patch for security fixes.

@terrytangyuan
Copy link
Member Author

#12900 and #12901

@SlaterByte
Copy link
Contributor

@isubasinghe, I see that #12413 was originally included as a feature addition for v3.5.5, but the was removed from your final comment. Is this feature being bumped to v3.5.6 or to a v3.6.x release? I see a few followup PRs ( #12596, #12632, #12862) as well, so maybe there was a stability concern? Looking forward to getting this feature released. Thanks!

@agilgur5
Copy link
Member

I see that #12413 was originally included as a feature addition for v3.5.5, but the was removed from your final comment. Is this feature being bumped to v3.5.6 or to a v3.6.x release?

It's a feature, so it will be released in the next minor, v3.6.

@agilgur5
Copy link
Member

#12900 and #12901

Backported both to release-3.5

@agilgur5
Copy link
Member

Released v3.5.6

@terrytangyuan
Copy link
Member Author

terrytangyuan commented Apr 29, 2024

Any objections to cherry-pick #12736 to the next 3.5 patch release?

@agilgur5
Copy link
Member

agilgur5 commented Apr 29, 2024

Nope, had been planning to do so since it's a feature that fixes substantial 3.5 regressions (so long as it didn't break anything). Had also added the 3.5.x milestone to the respective issues

@terrytangyuan
Copy link
Member Author

terrytangyuan commented May 16, 2024

@Joibel
Copy link
Member

Joibel commented May 16, 2024

I'd like to get #13004 in to 3.5.7 please. It needs an approver review.

@shuangkun
Copy link
Member

shuangkun commented May 17, 2024

could #12701 be reviewed, it fixes a very old p1 issue #9193

@shuangkun
Copy link
Member

could #12936 be added, some user needs it #12936 (comment)

@terrytangyuan
Copy link
Member Author

All added to the list.

@agilgur5
Copy link
Member

agilgur5 commented May 17, 2024

I am planning to only cherry-pick important fixes to 3.5.7

@terrytangyuan maybe I should've clarified before, I might've misunderstood the intent your question during this week's Contributor Meeting.
I've already been cherry-picking all fixes and deps security upgrades on an ongoing basis (roughly weekly, sometimes quicker), per the "release manager" approach I suggested in #12592 (comment).
So fixes that landed before your comment are likely already cherry-picked in.

I've also been using the v3.5.x patches milestone I created to track everything

Regarding this one, we should cherry-pick the original PR (#12736), the revert with CI fix (#13018), and the fixed PR (#13021). As that would reduce merge conflicts and have a cleaner and more matching git history (which also helps with our scripts etc). I'll probably do that today

@terrytangyuan
Copy link
Member Author

UI security fix: #13069

@terrytangyuan
Copy link
Member Author

@agilgur5 Can you help make sure all PRs in the list #11997 (comment) are cherry-picked into release branch and then we can push the tag?

@agilgur5
Copy link
Member

agilgur5 commented May 26, 2024

UI security fix: #13069

This would require a several other backports to make work as I detailed in #13069 (review).
Argo v3.5 is on swagger-ui-react v4 as #12540 was never backported and then there are several React incompatibilities with that PR itself as well.

@agilgur5 Can you help make sure all PRs in the list #11997 (comment) are cherry-picked into release branch and then we can push the tag?

Other than the above, yes, that was my plan.

@agilgur5
Copy link
Member

Released v3.5.7.

Includes all merged fixes and security patches except for two due to #13069 (review) and #13012 (comment).

Also lots of docs backports and a few CI security backports

See the changelog for more details: #13096

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/feature Feature request
Projects
None yet
Development

No branches or pull requests