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

[meta] Rename default branch to main #3761

Closed
3 tasks done
nschonni opened this issue Mar 18, 2021 · 26 comments
Closed
3 tasks done

[meta] Rename default branch to main #3761

nschonni opened this issue Mar 18, 2021 · 26 comments

Comments

@nschonni
Copy link
Member

nschonni commented Mar 18, 2021

Issue tracking the renames across the org nodejs/node#33864

@mhdawson
Copy link
Member

Assume this is still underway?

@nschonni
Copy link
Member Author

@mhdawson I just sent a PR for the nodejs/build webhook, so I think it's mainly the rename that needs to happen before the 2 PRs are landed.
The Crowdin part isn't really used right now, so it can probably get cleaned up later

@mhdawson
Copy link
Member

@nschonni I can do the rename if you think everything is ready, just let me know.

@nschonni
Copy link
Member Author

I think it should be good to go, as long as there isn't a pending release that might need release notes to get published today. I'm guessing there might be some manual work to redeploy the webhook on the build PR, so the related PR here is picked up

@mhdawson
Copy link
Member

@BethGriggs what would be a good time to do the rename from the perspective of avoiding releases?

@BethGriggs
Copy link
Member

BethGriggs commented Jun 21, 2021

It looks like our next set of releases are not scheduled until 29th June, so anytime this week should be a good. But, generally, we aim for Tuesday releases, so just avoiding those seems reasonable.

Edit: Looks like we delayed v16.4.0 until 22nd June - so worth waiting until that has gone out

@richardlau
Copy link
Member

We still haven't released nodejs/node#39031 yet (when discussed in last weeks' Release WG meeting the plan was to delay/try for tomorrow (22 June)).

@mhdawson
Copy link
Member

At this point I think we should likely wait until after the upcoming security release.

@mhdawson
Copy link
Member

@richardlau do you know what we need to do/have access to do the "might be some manual work to redeploy the webhook on the build PR,"

@richardlau
Copy link
Member

@mhdawson I'll find out -- I roughly know the bit on the infra servers that rebuild the website but would need to dig through to work out how the webhook works.

@richardlau
Copy link
Member

@mhdawson For the webhook we'd need to update two files on the www server and then restart the github-webhook.service systemd service.

  • Update these references to origin/master:
  • Update the files on www. I've never actually run the playbook in https://github.com/nodejs/build/tree/master/ansible/www-standalone before -- the README says it's not tested against the live server and I think we've generally made changes on the server and reflected them back into the Ansible scripts rather than doing them first in Ansible. The two referenced files above end up on the server as:
  • /etc/github-webhook.json (this looks different to the one in the repo -- at some point we dropped the webhook for benchmarking but don't appear to have updated the repo)
  • /home/nodejs/build-site.sh
  • Restart the github-webhook.service (e.g. systemctl restart github-webhook.service) to reload the configuration.

@richardlau
Copy link
Member

@mhdawson Also I believe I have access to do the build-infra side of this.

@mhdawson
Copy link
Member

mhdawson commented Sep 16, 2021

In respect to

Update the files on www. I've never actually run the playbook in https://github.com/nodejs/build/tree/master/ansible/www-standalone before -- the README says it's not tested against the live server and I think we've generally made changes on the server and reflected them back into the Ansible scripts rather than doing them first in Ansible. The two referenced files above end up on the server as:

+1 I think we should do the manual changes and reflect back.

@mhdawson
Copy link
Member

@richardlau thanks. Once the PR is updated as you requested, we should find a good time to do the update. Maybe you can look at the upcoming schedule and then confirm with the releasers what a good time would be?

@mhdawson
Copy link
Member

As a separate thought (not part of this issue/work) it might be good to audit the differences between the files in the repo and what is on the www server. I expect there may be a bunch of differences.

@nschonni
Copy link
Member Author

Not to go too far off topic, but I also opened up #3018 awhile ago, since we do occasionally have issues with the webhook. But that is separate from this issue. I'll take a look at the build PR comments now

@richardlau
Copy link
Member

@richardlau thanks. Once the PR is updated as you requested, we should find a good time to do the update. Maybe you can look at the upcoming schedule and then confirm with the releasers what a good time would be?

The build PR has been updated and looks good. As far as releases go the next planned ones are next Tuesday (21st Sept, 16.x cc @BethGriggs) with a 14 semver minor the week after that (nodejs/node#39990). We could aim to do this tomorrow?

@mhdawson
Copy link
Member

@richardlau I guess we did not do it today since I see no discussion here. Would you be able to do it next Wednesday the day after the release?

@richardlau
Copy link
Member

@mhdawson Yes but I'd need you or another repository owner to do the actual rename here (I can do the build-infra bit).

@mhdawson
Copy link
Member

I can do the rename, would doing it together at 12 ET work?

@richardlau
Copy link
Member

I can do the rename, would doing it together at 12 ET work?

SGTM

@mhdawson
Copy link
Member

Branch renamed, and we landed a PR (#4122) and from what we can see so far we think the webhook ran ok.

@nschonni
Copy link
Member Author

Rebased and landed #3762 so the "Edit on GitHub" links will work in the footer.
Only outstanding piece seems to be Crowd-in, but I'm unsure how much that ever got used to be honest

@XhmikosR
Copy link
Contributor

Can we close this issue now that the branch renaming is done?

As for Crowdin, if it's not used, is there any reason we keep the README.md badge, its config and a PR open?

@nschonni
Copy link
Member Author

I believe the Crowdin part was never fixed, but I don't think it's really ever got traction @nodejs/crowdin-managers

@AugustinMauroy
Copy link
Member

I believe the Crowdin part was never fixed, but I don't think it's really ever got traction

look up here #4994

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

No branches or pull requests

6 participants