Fix branch names for releases

[fredemmott]

This never worked; on the build infra, things are OK because we ignore failure and the EC2 user script checks out the correct branch.

Test Plan:

ran for 3.30.10 with:

diff --git a/build-and-tag.sh b/build-and-tag.sh
index a89f718..b4e8a89 100755
--- a/build-and-tag.sh
+++ b/build-and-tag.sh
@@ -29,22 +29,23 @@ else
   else
     HHVM_REPO_DISTRO="bionic-${MAJ_MIN}"
   fi
+  git stash
   git checkout "origin/HHVM-$MAJ_MIN" 2>/dev/null
 fi

-docker build \
-  --build-arg "HHVM_PACKAGE=$HHVM_PACKAGE" \
-  --build-arg "HHVM_REPO_DISTRO=$HHVM_REPO_DISTRO" \
-  -t "hhvm/hhvm:$VERSION" \
-  hhvm-latest/
-
-docker build \
-  --build-arg "HHVM_BASE_IMAGE=hhvm/hhvm:$VERSION" \
-  -t "hhvm/hhvm-proxygen:$VERSION" \
-  hhvm-latest-proxygen/
-
-docker push hhvm/hhvm:$VERSION
-docker push hhvm/hhvm-proxygen:$VERSION
+#docker build \
+#  --build-arg "HHVM_PACKAGE=$HHVM_PACKAGE" \
+#  --build-arg "HHVM_REPO_DISTRO=$HHVM_REPO_DISTRO" \
+#  -t "hhvm/hhvm:$VERSION" \
+#  hhvm-latest/
+#
+#docker build \
+#  --build-arg "HHVM_BASE_IMAGE=hhvm/hhvm:$VERSION" \
+#  -t "hhvm/hhvm-proxygen:$VERSION" \
+#  hhvm-latest-proxygen/
+#
+#docker push hhvm/hhvm:$VERSION
+#docker push hhvm/hhvm-proxygen:$VERSION

 for TAG in $(<EXTRA_TAGS); do
   docker tag "hhvm/hhvm:$VERSION" "hhvm/hhvm:$TAG"

[jjergus]

Huh, I am confused why the original version wouldn't work.

It works fine when I try it:

$ git checkout HHVM-4.20
Branch 'HHVM-4.20' set up to track remote branch 'HHVM-4.20' from 'origin'.
Switched to a new branch 'HHVM-4.20'

And in fact, this new one doesn't work:

$ git checkout origin/HHVM-4.19
Note: checking out 'origin/HHVM-4.19'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at cb6ef80 Removing 'latest' tag

(it checks out fine but AFAIK git push wouldn't work correctly in this state)

Also, we have git checkout <remote branch name> all around the packaging repository, it's never git checkout origin/<remote branch name>.

[jjergus]

Also the script is run from whatever branch you were at originally, so checking out a different branch in the middle of the script doesn't change what commands the script will run. Not sure if that was your intention or something else.

[fredemmott]

It didn’t work because the old version was missing “HHVM-“ from the branch name

[fredemmott]

Yeah, it doesn't change the commands, but does change the behavior of:

for TAG in $(<EXTRA_TAGS); do