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

feat: release 2.10.3 #5985

Merged
merged 8 commits into from
Jan 9, 2022
Merged

Conversation

bzp2010
Copy link
Contributor

@bzp2010 bzp2010 commented Dec 31, 2021

What this PR does / why we need it:

Update rockspec and CHANGELOG for version 2.10.3. And updates related to version code and documentation will be provided in the PR of release/2.10 to prevent affecting the master branch.

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@bzp2010 bzp2010 changed the title feat: release 2.10.2 feat: release 2.10.3 Dec 31, 2021
@bzp2010 bzp2010 self-assigned this Dec 31, 2021
@juzhiyuan
Copy link
Member

Hi @bzp2010, do we need this? #5958

@bzp2010
Copy link
Contributor Author

bzp2010 commented Jan 1, 2022

Hi @bzp2010, do we need this? #5958

@juzhiyuan They will be pushed to a different branch. The use of this PR for pushing to master branch can be found in the following PR. In this release, some of the changes involved in the following PR [1] will be split into two parts to prevent affecting the master branch code.

[1] #5508

Copy link
Member

@spacewander spacewander left a comment

Choose a reason for hiding this comment

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

Merge this changelog will confuse the user about the timeline. Those fixes are in 2.10.3 but not in 2.11.0. Also, when we release 2.12.0, we have to mention some of those fixes again.

And this PR doesn't update the Chinese version of CHANGELOG.

@bzp2010
Copy link
Contributor Author

bzp2010 commented Jan 2, 2022

Merge this changelog will confuse the user about the timeline. Those fixes are in 2.10.3 but not in 2.11.0. Also, when we release 2.12.0, we have to mention some of those fixes again.

And this PR doesn't update the Chinese version of CHANGELOG.

Hi, @spacewander.

I understand what you said, which may cause confusion to users.

I added a partial description of what PRs were merged into this "LTS maintenance release" for version 2.10.3 as shown below, does this ease the confusion? Or do I need to remove CHANGELOG and make it provide only in the 2.10 branch. (But a CHANGELOG in the master branch is also need? How should I do it?)

Also, I have added the Chinese version of CHANGELOG.

@spacewander
Copy link
Member

@bzp2010
Your solution doesn't solve the problem I mention...

docs/zh/latest/CHANGELOG.md Outdated Show resolved Hide resolved
@@ -0,0 +1,95 @@
--
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we don't need to archive this rockspec? We don't merge the code into the default branch.

Copy link
Contributor Author

@bzp2010 bzp2010 Jan 4, 2022

Choose a reason for hiding this comment

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

@spacewander Here it is marked for installation using the 2.10.3 git tag, as far as I know this could potentially be used when packaging various container images?

https://github.com/apache/apisix-docker/blob/5d3c4c63d21f0c40655d005fdb9cb3746f2e4af3/alpine/Dockerfile#L22

So, IMO, we need it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi, @spacewander. Do I need to make changes for this?

Copy link
Member

Choose a reason for hiding this comment

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

I see.

@spacewander spacewander merged commit 7db31a1 into apache:master Jan 9, 2022
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.

8 participants