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

Do not use word master #71

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Do not use word master #71

merged 4 commits into from
Oct 26, 2023

Conversation

pastey
Copy link
Contributor

@pastey pastey commented Oct 20, 2023

Switch to main branch instead of master in all tests and some code.
Most changes are in tests.
Minimal amount of changes in root scripts and system7 directory (the actual code). But, those changes are used only in tests :)

Reasons:

  1. black lives matter
  2. currently, to run integration tests on the local machine, I had to git config --global init.defaultBranch master. Ironically, GitHub runners still have some outdated git (?) and I had to add git config --global init.defaultBranch main to make tests run properly in PR checks.

Next steps:

  • merge the PR
  • create main branch
  • set the main branch as default in this repo
  • update README and How to build rd2 to the new url with install script
  • set a reminder in a month to remove master branch

Copy link
Contributor

@nikinapi nikinapi left a comment

Choose a reason for hiding this comment

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

успешный файнд-реплейс

@pastey pastey merged commit da5026d into master Oct 26, 2023
2 checks passed
@pastey pastey deleted the do-not-use-word-master branch October 26, 2023 08:33
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.

3 participants