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

feat: Renaming master to main wherever it's referenced #1476

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

yhakbar
Copy link
Contributor

@yhakbar yhakbar commented Dec 2, 2024

Description

Fixes #1473.

Right before merging this, we'll need to explicitly perform the rename of the default branch from master to main in the GitHub repository settings.

This will ensure that all PRs get moved over to the new branch name, etc.

TODOs

Read the Gruntwork contribution guidelines.

  • Update the docs.
  • Run the relevant tests successfully, including pre-commit checks.
  • Ensure any 3rd party code adheres with our license policy or delete this line if its not applicable.
  • Include release notes. If this PR is backward incompatible, include a migration guide.

Release Notes (draft)

Updated default branch from master to main.

Migration Guide

If you have a locally cloned copy of Terratest, make sure to delete the master branch and check out the main branch.

@yhakbar yhakbar requested a review from denis256 as a code owner December 2, 2024 15:45
Copy link
Contributor

@james03160927 james03160927 left a comment

Choose a reason for hiding this comment

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

LGTM

@james03160927 james03160927 self-assigned this Dec 3, 2024
Copy link
Contributor

@james03160927 james03160927 left a comment

Choose a reason for hiding this comment

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

It seems like this change is breaking some unit tests.

  • TestGitRefChecks/GetCurrentBranchNameReturnsBranchName
  • TestGitRefChecks/GetCurrentBranchNameReturnsBranchName

Other failing tests don't seem to be related.

@yhakbar
Copy link
Contributor Author

yhakbar commented Dec 3, 2024

It seems like this change is breaking some unit tests.

  • TestGitRefChecks/GetCurrentBranchNameReturnsBranchName
  • TestGitRefChecks/GetCurrentBranchNameReturnsBranchName

Other failing tests don't seem to be related.

It seemed to me like the root cause of those failures was in itself the change in branch name. Is that assessment wrong?

@yhakbar
Copy link
Contributor Author

yhakbar commented Dec 3, 2024

If I'm not being clear, this line:
https://github.com/gruntwork-io/terratest/pull/1476/files#diff-61142d541db9ae6c5a711f72f57cf7c1c312cda26bf0e9a6d8d09e6188e83f11L32-R32

Won't work right now because the main branch doesn't exist. Once we rename master to main, it should.

@james03160927
Copy link
Contributor

If I'm not being clear, this line: https://github.com/gruntwork-io/terratest/pull/1476/files#diff-61142d541db9ae6c5a711f72f57cf7c1c312cda26bf0e9a6d8d09e6188e83f11L32-R32

Won't work right now because the main branch doesn't exist. Once we rename master to main, it should.

If I'm not being clear, this line: https://github.com/gruntwork-io/terratest/pull/1476/files#diff-61142d541db9ae6c5a711f72f57cf7c1c312cda26bf0e9a6d8d09e6188e83f11L32-R32

Won't work right now because the main branch doesn't exist. Once we rename master to main, it should.

Ah you are right. LGTM then!

Copy link
Contributor

@james03160927 james03160927 left a comment

Choose a reason for hiding this comment

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

LGTM

@james03160927 james03160927 merged commit 0dd5746 into master Dec 4, 2024
2 of 3 checks passed
@james03160927 james03160927 deleted the yousif/sme-2133-moving-to-main branch December 4, 2024 01:56
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.

Moving to main
2 participants