refactor(all): rename master to main #3953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update references to master to be main Fixes: canonical#3952.
huwshimi
commented
May 20, 2022
| @@ -18,15 +18,15 @@ jobs: | |||
| - name: Initialise MAAS | |||
| run: sudo maas init region+rack --maas-url=${{env.MAAS_URL}}/MAAS --database-uri maas-test-db:/// | |||
| - name: Install Cypress | |||
| uses: cypress-io/github-action@master | |||
| uses: cypress-io/github-action@v2 | |||
There was a problem hiding this comment.
This wasn't strictly necessary it just seemed to be what the cypress docs suggested, but can revert this change if there's a reason for it to be on master.
| @@ -34,6 +34,10 @@ Related Launchpad maas issue in the form `lp#number`. | |||
|
|
|||
| ## Backports | |||
|
|
|||
| In general, please propose fixes against *master* rather than release branches (e.g. 2.7), unless the fix is only applicable for that specific release. Please apply backport labels to the PR (e.g. "Backport 2.7") for the appropriate releases to target. | |||
| In general, please propose fixes against _main_ rather than release branches (e.g. 2.7), unless the fix is only applicable for that specific release. Please apply backport labels to the PR (e.g. "Backport 2.7") for the appropriate releases to target. | |||
There was a problem hiding this comment.
Not quite sure why prettier changed * to _.
| Only bug and security fixes should be backported, new features should only land in master. | ||
| Only bug and security fixes should be backported, new features should only land in main. | ||
|
|
||
| ## Screenshots |
There was a problem hiding this comment.
Just a driveby I've been meaning to add for ages.
petermakowski
approved these changes
May 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Done
QA
n/a
Fixes
Fixes: #3952.