Skip to content

Commit

Permalink
Merge pull request #98 from junpataleta/masterRemoval
Browse files Browse the repository at this point in the history
Remove support for syncing the `master` branch with `main`
  • Loading branch information
HuongNV13 authored Aug 12, 2024
2 parents c8e3a58 + 03f6bb2 commit 51cb081
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
10 changes: 1 addition & 9 deletions prerelease.sh
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
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

0 comments on commit 51cb081

Please sign in to comment.