Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rename master to main #712

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

Merged
merged 7 commits into from
Dec 10, 2021
Merged

Rename master to main #712

merged 7 commits into from
Dec 10, 2021

Conversation

jwcooper
Copy link
Member

@jwcooper jwcooper commented Jun 7, 2021

This depends on solving all outstanding issues in the following issue:
#711

@jwcooper jwcooper requested a review from kattni June 7, 2021 21:16
@jwcooper jwcooper marked this pull request as draft June 7, 2021 21:19
@lesamouraipourpre
Copy link
Contributor

There is a reference in images.yml as well

- uses: actions/checkout@master

@jwcooper
Copy link
Member Author

jwcooper commented Jun 9, 2021

There is a reference in images.yml as well

- uses: actions/checkout@master

I've updated that to use v2 of the checkout action.

@lesamouraipourpre
Copy link
Contributor

There is a reference in images.yml as well

- uses: actions/checkout@master

I've updated that to use v2 of the checkout action.

Shouldn't this be
- uses: actions/checkout@main for the change to main

@dhalbert
Copy link
Collaborator

dhalbert commented Jun 9, 2021

- uses: actions/checkout@<some-tag> is a tag or branch name from https://github.com/actions/checkout, not related to our main. They have switched to main in that repo, but usually you want to stick to a particular major version (e.g., v2) for a particular GitHub action.

@lesamouraipourpre
Copy link
Contributor

- uses: actions/checkout@<some-tag> is a tag or branch name from https://github.com/actions/checkout, not related to our main. They have switched to main in that repo, but usually you want to stick to a particular major version (e.g., v2) for a particular GitHub action.

Slight misunderstanding on my part. As Dan said, I think - uses: actions/checkout@v2 is the current recommended usage, even though the last release was in November.

@jepler
Copy link
Contributor

jepler commented Dec 7, 2021

What's needed to move this forward?

@jwcooper
Copy link
Member Author

jwcooper commented Dec 7, 2021

As of the PR release, I think we just needed to check that any bots pushing to this repo were using main instead of master? I'm not really sure. The changes in this PR should still be OK, but we'll need to update any newly added board files still referencing master.

@jwcooper
Copy link
Member Author

jwcooper commented Dec 7, 2021

I've just synced it up with master and updated any new files. This PR is now back up to date.

@makermelissa @tannewt is there anything else we need to do to get this one in? Any adabot changes?

Edit: I see we were waiting on #711, which appears to be ready now, maybe.

@jwcooper jwcooper marked this pull request as ready for review December 7, 2021 19:49
@jwcooper jwcooper requested a review from makermelissa December 7, 2021 19:49
@FoamyGuy
Copy link
Contributor

FoamyGuy commented Dec 7, 2021

On the Blinka devices there is a link near the bottom of their MD files:
image

The URL for that link appears to have the master branch coded into it. So that would need to get updated to main in each md file I think. i.e.

Have some info to add for this board? Edit the source for this page [here](https://github.com/adafruit/circuitpython-org/edit/master/_blinka/{{ page.board_id }}.md).

There are a few places in this guide where the same thing could get updated: https://learn.adafruit.com/how-to-add-a-new-board-to-the-circuitpython-org-website/adding-to-blinka

Maybe some or all of the non-blinka microcontrollers have this as well I haven't done a thorough check, but Feather Express M4 does have a similar link that could get updated.

This process could probably be automated fairly easily instead of trying to do all of them "by hand"

@jwcooper
Copy link
Member Author

jwcooper commented Dec 7, 2021

@FoamyGuy those should all be synced up now as well.

@FoamyGuy
Copy link
Contributor

FoamyGuy commented Dec 7, 2021

Ah, that is right, I see them in the changes now. @jwcooper thank you.

Updating the accompanying example file references on these pages: https://learn.adafruit.com/how-to-add-a-new-board-to-the-circuitpython-org-website/adding-to-downloads

https://learn.adafruit.com/how-to-add-a-new-board-to-the-circuitpython-org-website/adding-to-blinka

were the only two places I found in Learn Guides that may need updated to match when the time comes.

@jepler
Copy link
Contributor

jepler commented Dec 7, 2021

still another conflict :-/

@makermelissa
Copy link
Collaborator

makermelissa commented Dec 7, 2021

I changed the name to raspberry_pi_cm4io (and the content) to reflect the fact that we have multiple carrier boards that can run the compute module 4.

@jwcooper
Copy link
Member Author

@jepler @makermelissa this should be ready again.

Copy link
Collaborator

@makermelissa makermelissa left a comment

Choose a reason for hiding this comment

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

Looks good to me. Jeff is out on vacation.

@dhalbert
Copy link
Collaborator

I don't think we need to wait for Jeff. It's been reviewed. You could merge and we will see that it works or not, and fix it.

@kattni
Copy link
Contributor

kattni commented Dec 10, 2021

I'm ok with merging this.

@kattni kattni merged commit 79ea967 into adafruit:master Dec 10, 2021
@dhalbert
Copy link
Collaborator

I renamed the default branch now to main.

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.

7 participants