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

Default to branch named "main" #299

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Default to branch named "main" #299

merged 1 commit into from
Oct 7, 2024

Conversation

trotzig
Copy link
Contributor

@trotzig trotzig commented Sep 27, 2024

In cases where we can't figure out a baseline commit in our CI scripts, we default to origin/master. This was the usual default branch name back in the days, but it has since changed to origin/main. I'm making the switch to "main" now.

This is a breaking change but one that is easy to make non-breaking if you use a BASE_BRANCH=origin/master environment variable.

In cases where we can't figure out a baseline commit in our CI scripts,
we default to `origin/master`. This was the usual default branch name
back in the days, but it has since changed to `origin/main`. I'm making
the switch to "main" now.

This is a breaking change but one that is easy to make non-breaking if
you use a BASE_BRANCH=origin/master environment variable.
Copy link

@9I73 9I73 left a comment

Choose a reason for hiding this comment

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

TARGET_BRANCH=$(echo "${SYSTEM_PULLREQUEST_TARGETBRANCH}" | cut -d '/' -f3)

@@ -3,7 +3,7 @@
# Make the whole script fail on errors
set -euo pipefail

BASE_BRANCH=${BASE_BRANCH:-"origin/master"}
BASE_BRANCH=${BASE_BRANCH:-"origin/main"}

This comment was marked as off-topic.

@@ -33,7 +33,7 @@
"type": "User",

This comment was marked as off-topic.

@trotzig trotzig merged commit 6ca5d80 into main Oct 7, 2024
4 checks passed
@trotzig trotzig deleted the master-main branch October 7, 2024 09:14
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