From 03f6bb2672a86e780f94547fac65e30092964546 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Mon, 12 Aug 2024 13:15:51 +0800
Subject: [PATCH] Remove support for syncing the `master` branch with `main`

---
 prerelease.sh | 10 +---------
 release.sh    |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/prerelease.sh b/prerelease.sh
index 67ff731d..bafe853 100755
--- a/prerelease.sh
+++ b/prerelease.sh
@@ -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() {
@@ -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
diff --git a/release.sh b/release.sh
index 8f38a15..bdda55f 100755
--- a/release.sh
+++ b/release.sh
@@ -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.