Skip to content

Updated references master to main#1132

Merged
valeriupredoi merged 5 commits into
masterfrom
update_master2main
May 26, 2021
Merged

Updated references master to main#1132
valeriupredoi merged 5 commits into
masterfrom
update_master2main

Conversation

@axel-lauer

@axel-lauer axel-lauer commented May 17, 2021

Copy link
Copy Markdown
Contributor

This PR updates all references to "master" e.g. in the documentation and readme files (master branch) to "main" (the new GitHub standard, see https://github.com/github/renaming). See also corresponding PR in ESMValTool: ESMValGroup/ESMValTool#2172.

Closes #1031


Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.

@axel-lauer axel-lauer changed the title updated references: master --> main Updated references master to main May 17, 2021
@valeriupredoi

Copy link
Copy Markdown
Contributor

cheers @axel-lauer let me check and commit if need be the tests conf files 👍

@axel-lauer

Copy link
Copy Markdown
Contributor Author

@ESMValGroup/esmvaltool-coreteam are we now theoretically ready to rename master to main and then merge this PR and ESMValGroup/ESMValTool#2172?

@valeriupredoi

Copy link
Copy Markdown
Contributor

Axel, it's a go from my side, mate! we should probably add a test (GA or Circle) detect any instance of creation of a branch called master after we've switched to main and inspect/delete that, what do you think @bouweandela

@valeriupredoi valeriupredoi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

fine by me, cheers much @axel-lauer -> @bouweandela could you give it a look too when you gots some review time pls mate 🍺

Comment thread .github/workflows/action-install-from-conda.yml Outdated
@valeriupredoi

Copy link
Copy Markdown
Contributor

Come on @bouweandela -> maain sounds quite Dutch, surprised you didn't like it 🤣

@bouweandela

Copy link
Copy Markdown
Member

The tests are failing, but it looks like that was solved in #1140, so merging master into this branch will probably solve that?

@valeriupredoi

Copy link
Copy Markdown
Contributor

on it now @bouweandela - you reckon it'll be ready for merge after? I think it's all OK

@valeriupredoi valeriupredoi marked this pull request as ready for review May 26, 2021 15:21
@valeriupredoi

Copy link
Copy Markdown
Contributor

checks have passed, gonna merge, cheers @axel-lauer and @bouweandela 🍺 Shall we delete master once and for good or keep it just in queso

@valeriupredoi valeriupredoi merged commit 933b37b into master May 26, 2021
@valeriupredoi valeriupredoi deleted the update_master2main branch May 26, 2021 15:22
@jvegreg jvegreg added the documentation Improvements or additions to documentation label Jun 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Switch main branch from "master" to "main"

4 participants