[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528254#comment-17528254 ] Michael Mior commented on CALCITE-4147: --- For now I've removed this configuration so builds can run, but this could potentially cause an issue at release time. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 3h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528240#comment-17528240 ] Michael Mior commented on CALCITE-4147: --- Looking closer, it seems to be a problem with how I'm trying to configure the branch for the stage vote release plugin. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 3h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528220#comment-17528220 ] Michael Mior commented on CALCITE-4147: --- [~francischuang] Can you have a look a build failure on GitHub Actions that now appears in both repositories? I'm not sure of the reason for this. https://github.com/apache/calcite/runs/6177612906?check_suite_focus=true > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 3h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528219#comment-17528219 ] Michael Mior commented on CALCITE-4147: --- This is done and an email sent to the mailing list with detail. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 3h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528151#comment-17528151 ] Michael Mior commented on CALCITE-4147: --- [~francischuang] I opened a ticket with INFRA and I'll push the changes as soon as the branches are renamed. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 2h 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528120#comment-17528120 ] Francis Chuang commented on CALCITE-4147: - Sounds good to me! Please pull the trigger whenever you're ready :) > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 2h 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17528117#comment-17528117 ] Michael Mior commented on CALCITE-4147: --- [~francischuang] has reviewed the PRs and I think we're good to go ahead. Next step would be to ask INFRA to perform the rename of master branches in the calcite, calcite-site, and calcite-avatica repos. We might want a freeze on pushing to master during this time, although I'm not sure how long it will take INFRA to respond. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 2h 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17526630#comment-17526630 ] Michael Mior commented on CALCITE-4147: --- [~julianhyde] Sounds good. I just rebased both PRs and made a few updates to reflect recent changes. If someone has a chance to look over these, that would be great. As far as process goes, I'd suggest having INFRA do the move, then I would push the changes for Avatica, make sure everything looks good, then do the same for Calcite. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1.5h > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17526049#comment-17526049
]
Julian Hyde commented on CALCITE-4147:
--
Yes, I'd remove the references to {{{}new-master{}}}.
I agree that we should handle calcite and calcite-avatica in one INFRA ticket.
[~mmior], You are the author of PRs 2090 (calcite) and 124 (calcite-avatica).
The easiest thing would be if you file the INFRA ticket when those PRs are
rebased and ready to apply, and then you apply them after INFRA has renamed the
branches. Would you be OK doing that?
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
> Labels: pull-request-available
> Time Spent: 1.5h
> Remaining Estimate: 0h
>
> Settings to change:
> * GIT_COMMIT in [Calcite-Snapshots Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure]
> * Rename [Calcite-Master Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure]
> * Ask infra to rename the branch on GitHub using Github's renaming tool
> (open INFRA ticket)
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17525597#comment-17525597 ] Francis Chuang commented on CALCITE-4147: - Grepping through Avatica's and Calcite's repo, I noticed there's a travis job that triggers a build on changes to a branch called new-master: https://github.com/apache/calcite-avatica/blob/master/.travis.yml#L65 https://github.com/apache/calcite/blob/master/.travis.yml#L56 I was not able to find the branches on Github, may be it's safe to remove that branch's in .travis.yml as part of this change. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1.5h > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Ask infra to rename the branch on GitHub using Github's renaming tool > (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17525594#comment-17525594 ] Francis Chuang commented on CALCITE-4147: - As the migration for calcite-avatica-go was successful, I suggest that we make the changes for both calcite and calcite-avatica together by having infra rename the repos in one ticket. To minimize disruption, the commits for calcite and calcite-avatica can be prepared before infra renames the branch and then immediately pushed to Github as soon as the branches have been renamed. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1.5h > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17525400#comment-17525400
]
Julian Hyde commented on CALCITE-4147:
--
The [email|https://lists.apache.org/thread/g4mfpmj9xln1pn2lqt0y3htcccl8tjd5]
from [~francischuang] had the following instructions:
For your local checked out copies of the repository, please do the following to
migrate:
# Ensure you are in the repository's folder in your command line.
# Stash any uncommitted changes:
** {{git stash}}
# Check out your local {{master}} branch:
** {{git checkout master}}
# Rename your local {{master}} branch to {{main}}:
** {{git branch -m master main}}
# Fetch latest commits and branches from remote:
** {{git fetch}}
# Remove the tracking branch:
** {{git branch --unset-upstream}}
# Create a new tracking branch (assuming the remote is called {{origin}}):
** {{git branch -u origin/main}}
# Restore your uncommitted changes:
** {{git stash pop}}
The instructions worked fine for me.
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
> Labels: pull-request-available
> Time Spent: 1.5h
> Remaining Estimate: 0h
>
> Settings to change:
> * GIT_COMMIT in [Calcite-Snapshots Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure]
> * Rename [Calcite-Master Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure]
> * Default branch on GitHub (open INFRA ticket)
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17525380#comment-17525380 ] Francis Chuang commented on CALCITE-4147: - This has been completed for calcite-avatica-go and calcite-site. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1.5h > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17525366#comment-17525366 ] Francis Chuang commented on CALCITE-4147: - Calcite-avatica-go's master has been renamed to main. However, I have not push the changes to find and replace everything in the repo from master to main as the Github action for building the website pushes to the master branch in calcite-site. I have opened INFRA-23175 to rename calcite-site's master to main and will finalize the rename for calcite-avatica-go as soon as calcite-site is renamed. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17524546#comment-17524546 ] Julian Hyde commented on CALCITE-4147: -- The only dependency I know between Calcite and Avatica is that Avatica's CI pulls Calcite's master branch. The 'git clone' command doesn't refer to Calcite's master branch by name, but the CI task refers to itself as Avatica's master branch in a few places. See [main.yml|https://github.com/apache/calcite-avatica/blob/f48dbc8c10d761d52a289d37eaf8e52b90239fa6/.github/workflows/main.yml#L47]. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17524470#comment-17524470 ] Michael Mior commented on CALCITE-4147: --- [~julianhyde] Sounds good. [~francischuang], let me know when you have something ready to test. I'm okay with reviving my PR for Calcite and working on that once we have calcite-avatica-go as a proof of concept. One question is how we want to coordinate between Avatica and Calcite. I think perhaps once calcite-avatica-go is migrated, we should try to plan Avatica and Calcite together. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17523939#comment-17523939 ] Julian Hyde commented on CALCITE-4147: -- Thanks [~francischuang]. Pull the trigger whenever you're ready. Then send upgrade instructions to the dev list. [~mmior], I've created one or two calcite-avatica-go sandboxes. Can you do do the same, so that we can both test the upgrade instructions. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.1#820001)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17523912#comment-17523912 ] Francis Chuang commented on CALCITE-4147: - [~julianhyde] Good idea, I can do this for calcite-avatica-go. There doesn't seem to be too many references to master for the repo (https://github.com/apache/calcite-avatica-go/search?q=master=), so it should be straight forward. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.1#820001)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17523877#comment-17523877 ] Julian Hyde commented on CALCITE-4147: -- I started a [new discussion thread|https://lists.apache.org/thread/0ktmy0kr14rg06w19zhhfqk3dljsgosx] and this time no objections were voiced. There were objections in last year's thread, and I do not presume that all of those people have since been convinced. But a majority of the community seems to be in favor, a minority seem to feel that's not worth the effort (for reasons given in the 2021 thread), and I think we should now move forward. I suggest we start with calcite-avatica-go (because it has fewer users and lower activity than our other repositories). Steps as follows: # File an INFRA ticket (similar to INFRA-22880); # Commit changes to make the repo work with the new branch (including user instructions and CI); # Email instructions for users to upgrade their sandboxes. When that process works, let's repeat for calcite and calcite-avatica. [~mmior] or [~francischuang], Would you like to do this? > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.20.1#820001)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17285850#comment-17285850 ] Michael Mior commented on CALCITE-4147: --- [~rubenql] Good to have that here for reference. However, although as far as I am aware, none of those votes were by committers. This doesn't mean that they should be ignored, but there also doesn't seem to be a strong technical justification for not making this change. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 1h 10m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17285841#comment-17285841 ] Ruben Q L commented on CALCITE-4147: Just for the record, there were several people in the community who expressed their reluctance about this change in the discussion in the [email thread|https://lists.apache.org/thread.html/r5bd747f5a634b4e07573d64fafb8ea7085a671eec86ef8fd03fc29bf%40%3Cdev.calcite.apache.org%3E]; some even cast a -1. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17285832#comment-17285832 ] Michael Mior commented on CALCITE-4147: --- [~francischuang] Thanks for reminding me of this. I must have missed the GitHub announcement, but it does look like they have indeed made some changes that will make this easier. I'll work on a draft PR with the necessary code changes for Calcite. We'll need to separately address the site repo and Avatica. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17285648#comment-17285648 ] Francis Chuang commented on CALCITE-4147: - [~mmior]I think Github has introduced the ability to rename the default branch: https://github.com/github/renaming#rename-existing I don't see any way to rename the default branch for apache repos from the web though, only non-default ones. Perhaps we might need to ask infra for help with this one. In any case I think the time is ripe for proceeding with this change. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17170763#comment-17170763 ] Francis Chuang commented on CALCITE-4147: - [~zhenw] See the discussion here: https://lists.apache.org/thread.html/r5bd747f5a634b4e07573d64fafb8ea7085a671eec86ef8fd03fc29bf%40%3Cdev.calcite.apache.org%3E > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17170762#comment-17170762 ] Zhen Wang commented on CALCITE-4147: [~mmior] any background explaination on this change? regulation requirement ? > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167862#comment-17167862 ] Michael Mior commented on CALCITE-4147: --- Correct. There will be a clear announcement if this changes. -- -- Michael Mior mm...@apache.org > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 50m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167712#comment-17167712 ] Chunwei Lei commented on CALCITE-4147: -- So I think the master branch is open for commits. Right? > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > Labels: pull-request-available > Time Spent: 40m > Remaining Estimate: 0h > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167565#comment-17167565 ] Francis Chuang commented on CALCITE-4147: - Good idea regarding waiting for Github to bring in their renaming feature. I think that should solve most of the pain points associated with this migration and make the renaming much smoother. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167559#comment-17167559 ] Michael Mior commented on CALCITE-4147: --- Thanks [~francischuang] . I also opened up [PR 53|https://github.com/apache/calcite-avatica-go/pull/53] for calcite-avatica-go. However, based on a response from INFRA, it seems like it might be best to temporarily pause on this. GitHub has [announced plans|https://github.com/github/renaming#later-this-year-seamless-move-for-existing-repositories-] to solve some of the pain points with renaming that should be available later this year. GitHub has recommended waiting until these changes are released, which seems wise. (This includes retargeting open PRs which [~vladimirsitnikov] raised as an important concern.) > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167545#comment-17167545 ] Francis Chuang commented on CALCITE-4147: - [~mmior] From what I can see PR 124 for Avatica looks good to me. I agree with [~vladimirsitnikov] regarding references to "master" what will need to be changed in the release plugin, but other than that, I don't see any issues there. Do you mind opening a PR for calcite-avatica-go as well? There shouldn't be much to do there as I've avoided hard-coding any references to specific branches in the release script. There's only 2 references to "master" that has been hard coded: https://github.com/apache/calcite-avatica-go/search?q=master_q=master > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167497#comment-17167497 ] Michael Mior commented on CALCITE-4147: --- [~zabetak] Will do. I expect they just use the default branch so we won't have to do anything, but I'll confirm with INFRA before anything changes. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167493#comment-17167493
]
Michael Mior commented on CALCITE-4147:
---
Thanks! Unfortunately it seems the config change I made to set the branch
doesn't actually work. I just added {{source \{ branch.set("main") }}} similar
to the example config but this option isn't recognized.
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
> Settings to change:
> * GIT_COMMIT in [Calcite-Snapshots Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure]
> * Rename [Calcite-Master Jenkins
> pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure]
> * Default branch on GitHub (open INFRA ticket)
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167486#comment-17167486 ] Stamatis Zampetakis commented on CALCITE-4147: -- Thanks for picking this up [~mmior]. Can you also make sure that [asf.yaml features|https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features] will remain operational? > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167483#comment-17167483 ] Vladimir Sitnikov commented on CALCITE-4147: [~mmior], builds.apache.org will be decommissioned on 15 August 2020. We should move CI configuration to https://ci-builds.apache.org/job/Calcite/ I guess we might want to try Jenkinsfile, so Jenkins configuration is managed in a script. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > > Settings to change: > * GIT_COMMIT in [Calcite-Snapshots Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Snapshots/configure] > * Rename [Calcite-Master Jenkins > pipeline|https://builds.apache.org/view/A-D/view/Calcite/job/Calcite-Master/configure] > * Default branch on GitHub (open INFRA ticket) -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167478#comment-17167478
]
Vladimir Sitnikov commented on CALCITE-4147:
The way to validate it is:
1) Start the environment (in asflike-release-environment): {{./recreate.sh
calcite}}
2) Prepare release candidate (in calcite): {{./gradlew prepareVote -Prc=1}}
(note: there'no {{-Pasf}}, so it would use {{test}} release environment, and if
you add {{-Pasf}}, then it would use the ASF release servers)
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167473#comment-17167473 ] Michael Mior commented on CALCITE-4147: --- Opened [PR 2090|https://github.com/apache/calcite/pull/2090] for Calcite and [PR 124|https://github.com/apache/calcite-avatica/pull/124] for Avatica. I think perhaps the first and easiest change is to the site repo. [~francischuang], any potential concerns with this? I'm not sure how the automated builds are configured and if anything needs to be changed there. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167348#comment-17167348
]
Michael Mior commented on CALCITE-4147:
---
{quote}So extra commands needed to remove master (or initialize with main).
{quote}
I sent a PR which I think resolves this. Although I haven't fully tested since
I'm not entirely sure how to configure the release process to use this
environment.
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167347#comment-17167347
]
Michael Mior commented on CALCITE-4147:
---
{quote}It is very important to retarget before master removal.
{quote}
Good to know. On further investigation, it seems like Apache Mahout ended up
with an unexpected mass closing of PRs which we definitely want to avoid.
Although we could just keep master around for a time with pushes disabled. The
downside being that it wouldn't be possible to just press the merge button in
the GitHub web interface but those using the CLI won't experience any extra
friction.
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167319#comment-17167319
]
Vladimir Sitnikov commented on CALCITE-4147:
{quote}c) I see no reference to "master" in this repository so it seems like no
changes are needed (unless perhaps if there's something we want to test with
the new default branch name before actually making the change){quote}
It initializes Git repositories, so the default master branch would be created:
https://github.com/vlsi/asflike-release-environment/blob/155ba9c8eebfde3be2d86ce885cd7279e288b533/vcs-server/Dockerfile#L21
So extra commands needed to remove master (or initialize with main).
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167317#comment-17167317
]
Vladimir Sitnikov commented on CALCITE-4147:
{quote}However, I don't believe PRs would automatically be closed and there's
no reason they couldn't be targeted after the fact{quote}
I've seen that multiple times. If you remove a branch that is used as a PR
target, then PR gets closed, and it becomes dead even if you reopen it. It does
not pick up the branch updates. That is 100%. It is very important to retarget
before master removal.
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167304#comment-17167304 ] Michael Mior commented on CALCITE-4147: --- Thanks! a) it seems like this is just a [configuration update|https://github.com/michaelmior/calcite/blob/b471f6a8d13f8c10ebf74bb9fcc9a8c02f02693f/build.gradle.kts#L114-L116] (see link for what I believe is the correct change), but good to know b), I know Apache Mahout went through the same thing recently and I believe they were able to have their PRs automatically retargeted, but I've asked for clarification. However, I don't believe PRs would automatically be closed and there's no reason they couldn't be targeted after the fact. The old master ref that the PR is based on would still exist in the history. c) I see no reference to "master" in this repository so it seems like no changes are needed (unless perhaps if there's something we want to test with the new default branch name before actually making the change) > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Assignee: Michael Mior >Priority: Major > -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[
https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167285#comment-17167285
]
Vladimir Sitnikov commented on CALCITE-4147:
a) I guess there's a default `master` references (see the very end of
https://github.com/vlsi/vlsi-release-plugins/tree/master/plugins/stage-vote-release-plugin
-- branch.set("master") )
b) I guess we need to re-target the current PRs to the new branch name. It is
essential to re-target the PRs before the master branch is removed otherwise
the PRs would be closed with no way to restore them
c) I guess https://github.com/vlsi/asflike-release-environment needs to be
updated as well. That environment can be used to test the release procedure (it
spins SVN, Git, and Nexus).
> Rename "master" branch to "main"
>
>
> Key: CALCITE-4147
> URL: https://issues.apache.org/jira/browse/CALCITE-4147
> Project: Calcite
> Issue Type: Improvement
>Reporter: Michael Mior
>Assignee: Michael Mior
>Priority: Major
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (CALCITE-4147) Rename "master" branch to "main"
[ https://issues.apache.org/jira/browse/CALCITE-4147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17167271#comment-17167271 ] Michael Mior commented on CALCITE-4147: --- Here's the plan forward as I see it: # Replace all relevant references in documentation and build scripts/configuration with "main" # Audit CI for possible configuration changes external to the code base # Announce the pending change to the mailing list and temporarily freeze commits # Ask INFRA to make main the default branch and disable pushes to master # Ensure main is in sync with mater # Unfreeze commits I've pushed a first pass at these changes in a "main" branch on my fork. What is not currently addressed is Avatica and the calcite-site git repository. [~vlsi] since you did the heavy lifting with the recent Gradle changes, is there anything about the build/release process that you think needs to be changed? AFAICT, there isn't anything aside from documentation updates to ensure releases will be made from the "main" branch, but I want to avoid any unpleasant surprises. > Rename "master" branch to "main" > > > Key: CALCITE-4147 > URL: https://issues.apache.org/jira/browse/CALCITE-4147 > Project: Calcite > Issue Type: Improvement >Reporter: Michael Mior >Priority: Major > -- This message was sent by Atlassian Jira (v8.3.4#803005)
