You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by GitBox <gi...@apache.org> on 2020/11/03 14:14:01 UTC
[GitHub] [calcite] rubenada commented on a change in pull request #2229: Update release instructions
rubenada commented on a change in pull request #2229:
URL: https://github.com/apache/calcite/pull/2229#discussion_r516067535
##########
File path: site/_docs/howto.md
##########
@@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed
Before you start:
+* Send an email to [dev@calcite.apache.org](mailto:dev@calcite.apache.org) notifying that RC build process
+ is starting and therefore `master` branch is in code freeze until further notice.
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
+* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not
+ been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`.
+ If they are not in sync, cherry-pick the missing commit(s) into `master`.
Review comment:
You're right, I will re-phrase it.
##########
File path: site/_docs/howto.md
##########
@@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed
Before you start:
+* Send an email to [dev@calcite.apache.org](mailto:dev@calcite.apache.org) notifying that RC build process
+ is starting and therefore `master` branch is in code freeze until further notice.
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
+* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not
+ been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`.
+ If they are not in sync, cherry-pick the missing commit(s) into `master`.
Review comment:
Agree, there was a discussion about that some time ago [1], but I think no action has been taken in that direction.
[1] https://lists.apache.org/thread.html/0d9829f7e32f51bc03fc350fe7c782c03dedb2ecca90e983917abf53%40%3Cdev.calcite.apache.org%3E
##########
File path: site/_docs/howto.md
##########
@@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed
Before you start:
+* Send an email to [dev@calcite.apache.org](mailto:dev@calcite.apache.org) notifying that RC build process
+ is starting and therefore `master` branch is in code freeze until further notice.
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
+* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not
+ been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`.
+ If they are not in sync, cherry-pick the missing commit(s) into `master`.
Review comment:
@vlsi correct me if I'm wrong. The goal of this point is to ensure that "there is no commit on `site` that has not been applied also to `master`", otherwise we should apply these commits (onto `master`).
Doing a `git checkout site; git rebase -i master` will point the commits on `site` that are not in `master` (if any); but will not modify the `master` branch. That is why the `cherry-pick` tried to express; or am I wrong?
##########
File path: site/_docs/howto.md
##########
@@ -684,8 +688,13 @@ Note: release artifacts (dist.apache.org and repository.apache.org) are managed
Before you start:
+* Send an email to [dev@calcite.apache.org](mailto:dev@calcite.apache.org) notifying that RC build process
+ is starting and therefore `master` branch is in code freeze until further notice.
* Set up signing keys as described above.
* Make sure you are using JDK 8 (not 9 or 10).
+* Make sure `master` branch and `site` branch are in sync, i.e. there is no commit on `site` that has not
+ been applied also to `master`. You can check by doing `git checkout site; git rebase -i master`.
+ If they are not in sync, cherry-pick the missing commit(s) into `master`.
Review comment:
We need to be careful because there can be site-related commits in `master` that are not in `site`, this is "allowed" and we must not lose them.
Having commits in `site` that are not in `master` should not happen, but it can be possible if someone makes a (small) mistake.
All in all, I think the current phrase (`git checkout site; git rebase -i master` + `cherry-pick` any missing commits into master) might be the safest approach to achieve this without losing any master commit. wdyt?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org