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.

Sign up for GitHub

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

Remove support for syncing the master branch with main #98

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Remove support for syncing the master branch with main #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions prerelease.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ devbranches=("${DEVBRANCHES[@]}");
# Prepare an all branches array.
OLDIFS="$IFS"
IFS=$'\n'
# TODO: Remove master from the list once we delete it.
allbranches=($(for b in master "${DEVBRANCHES[@]}" "${STABLEBRANCHES[@]}" "${SECURITYBRANCHES[@]}" ; do echo "$b" ; done | sort -du))
allbranches=($(for b in "${DEVBRANCHES[@]}" "${STABLEBRANCHES[@]}" "${SECURITYBRANCHES[@]}" ; do echo "$b" ; done | sort -du))
IFS="$OLDIFS"

in_array() {
Expand Down Expand Up @@ -816,13 +815,6 @@ for branch in ${branches[@]};
fi

if (( $newcommits > 0 )) ; then
# TODO: Delete these 7 lines (comments and if block) once we delete master.
# Ensure that, always, master is the same as main.
if [[ "${branch}" == "main" ]]; then
git branch -f master main
integrationpush="$integrationpush master"
output " - ${Y}master branch updated to match main branch.${N}"
fi
output " + ${C}$branch done! $newcommits new commits to push.${N}"
integrationpush="$integrationpush $branch"
else
Expand Down
3 changes: 1 addition & 2 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ fi
# Prepare and array of all branches.
OLDIFS="$IFS"
IFS=$'\n'
# TODO: Remove master from the list once we delete it.
allbranches=($(for b in master "${DEVBRANCHES[@]}" "${STABLEBRANCHES[@]}" "${SECURITYBRANCHES[@]}" ; do echo "$b" ; done | sort -du))
allbranches=($(for b in "${DEVBRANCHES[@]}" "${STABLEBRANCHES[@]}" "${SECURITYBRANCHES[@]}" ; do echo "$b" ; done | sort -du))
IFS="$OLDIFS"

_verbose=true # Make lots of noise.
Expand Down