From 30bf9940a2f389aac9337cfd6c1945c17d9aac4e Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 22:57:47 +0800 Subject: [PATCH 1/7] Update release_process.rst about version number modification --- docs/contribute/release_process.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index 2b0fd924cee8..3909cecb706b 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -88,16 +88,23 @@ Cut a Release Candidate To cut a release candidate, one needs to first cut a branch using selected version string. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.11.0``, the branch should be ``v0.11`` and a tag named ``v0.11.0.rc0`` pushed to the HEAD of that branch once cut. +To cut a release candidate branch, one needs to push two commits in one pull request firstly. For example about v0.6 release, first commit need update version number from 0.6.dev0 to 0.6.0, second commit in same one pull request updating version number from 0.6.0 to 0.7.dev0. For this title of pull request, need specify: `[Dont squash]`. Second, after merged, cut a branch on first version number commit. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.6.0``, the branch should be ``v0.6`` and a tag named ``v0.6.0.rc0`` pushed to the HEAD of that branch once cut. + .. code-block:: bash git clone https://github.com/apache/tvm.git cd tvm/ - # Update version numbers + # Update version numbers of first commit # ... git add . git commit -m "Bump version numbers to v0.6.0" + # Update version numbers of second commit + # ... + git add . + git commit -m "Bump version numbers to v0.7.dev0" + # Replace v0.6 with the relevant version git branch v0.6 git push --set-upstream origin v0.6 From 385a0455cf70a10108d487aaab819556ca710ded Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 23:02:46 +0800 Subject: [PATCH 2/7] Update release_process.rst --- docs/contribute/release_process.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index 3909cecb706b..616150e53574 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -105,6 +105,8 @@ To cut a release candidate branch, one needs to push two commits in one pull req git add . git commit -m "Bump version numbers to v0.7.dev0" + # After pull request merged + # cut branch on first commit # Replace v0.6 with the relevant version git branch v0.6 git push --set-upstream origin v0.6 From b1ff81f132ccfe4b069d2d1f88557131af69a6f4 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 23:03:33 +0800 Subject: [PATCH 3/7] Update release_process.rst --- docs/contribute/release_process.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index 616150e53574..ce962bcb7fbd 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -88,7 +88,7 @@ Cut a Release Candidate To cut a release candidate, one needs to first cut a branch using selected version string. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.11.0``, the branch should be ``v0.11`` and a tag named ``v0.11.0.rc0`` pushed to the HEAD of that branch once cut. -To cut a release candidate branch, one needs to push two commits in one pull request firstly. For example about v0.6 release, first commit need update version number from 0.6.dev0 to 0.6.0, second commit in same one pull request updating version number from 0.6.0 to 0.7.dev0. For this title of pull request, need specify: `[Dont squash]`. Second, after merged, cut a branch on first version number commit. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.6.0``, the branch should be ``v0.6`` and a tag named ``v0.6.0.rc0`` pushed to the HEAD of that branch once cut. +To cut a release candidate branch, one needs to push two commits in one pull request firstly. For example about v0.6 release, first commit need update version number from 0.6.dev0 to 0.6.0, second commit in same one pull request updating version number from 0.6.0 to 0.7.dev0. For this title of pull request, need specify: `[Dont Squash]`. Second, after merged, cut a branch on first version number commit. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.6.0``, the branch should be ``v0.6`` and a tag named ``v0.6.0.rc0`` pushed to the HEAD of that branch once cut. .. code-block:: bash From 793adbd7730d54658e788b2d6d3b7ed8cd540021 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 23:04:26 +0800 Subject: [PATCH 4/7] Update release_process.rst --- docs/contribute/release_process.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index ce962bcb7fbd..c087a9836784 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -105,8 +105,8 @@ To cut a release candidate branch, one needs to push two commits in one pull req git add . git commit -m "Bump version numbers to v0.7.dev0" - # After pull request merged - # cut branch on first commit + # After pull request merged + # cut branch on first commit # Replace v0.6 with the relevant version git branch v0.6 git push --set-upstream origin v0.6 From f88a7f74b4f205172745e6f3dd59f5d14b369fdb Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 23:07:31 +0800 Subject: [PATCH 5/7] Update release_process.rst --- docs/contribute/release_process.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index c087a9836784..f7ed5d154bb6 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -86,9 +86,10 @@ The last step is to update the KEYS file with your code signing key https://www. Cut a Release Candidate ----------------------- -To cut a release candidate, one needs to first cut a branch using selected version string. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.11.0``, the branch should be ``v0.11`` and a tag named ``v0.11.0.rc0`` pushed to the HEAD of that branch once cut. +To cut a release candidate branch for v0.6 release: -To cut a release candidate branch, one needs to push two commits in one pull request firstly. For example about v0.6 release, first commit need update version number from 0.6.dev0 to 0.6.0, second commit in same one pull request updating version number from 0.6.0 to 0.7.dev0. For this title of pull request, need specify: `[Dont Squash]`. Second, after merged, cut a branch on first version number commit. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.6.0``, the branch should be ``v0.6`` and a tag named ``v0.6.0.rc0`` pushed to the HEAD of that branch once cut. +- Need push two commits in one pull request: the first commit need update version number from 0.6.dev0 to 0.6.0, second commit in same one pull request updating version number from 0.6.0 to 0.7.dev0. For this title of pull request, need specify: `[Dont Squash]`; +- After merged, cut a branch on first version number commit. Branches should be named with the base release version without the patch. For example, to cut a candidate for ``v0.6.0``, the branch should be ``v0.6`` and a tag named ``v0.6.0.rc0`` pushed to the HEAD of that branch once cut. .. code-block:: bash From d7ea78cc94a354862b08b7df838356f0482acb75 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Tue, 31 Oct 2023 23:09:10 +0800 Subject: [PATCH 6/7] Update release_process.rst --- docs/contribute/release_process.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index f7ed5d154bb6..f46d4840ad45 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -108,6 +108,8 @@ To cut a release candidate branch for v0.6 release: # After pull request merged # cut branch on first commit + git checkout + # Replace v0.6 with the relevant version git branch v0.6 git push --set-upstream origin v0.6 From 747c789ec0925b1a2b526d4f0300cd7d837dfa76 Mon Sep 17 00:00:00 2001 From: ysh329 Date: Wed, 1 Nov 2023 13:03:19 +0800 Subject: [PATCH 7/7] Update release_process.rst --- docs/contribute/release_process.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contribute/release_process.rst b/docs/contribute/release_process.rst index f46d4840ad45..e2ceff3295f0 100644 --- a/docs/contribute/release_process.rst +++ b/docs/contribute/release_process.rst @@ -108,7 +108,7 @@ To cut a release candidate branch for v0.6 release: # After pull request merged # cut branch on first commit - git checkout + git checkout # Replace v0.6 with the relevant version git branch v0.6