fix(release): Pull before tagging and move approval prompt (#107)

* fix(release): Pull before tagging

* fix(release): Move approval check outside of loop

* fix(release): Remove redundant comment

Author: NickLarsenNZ

release/merge-release-candidate.sh

@@ -43,6 +43,7 @@ parse_inputs() {
 }
 
 merge_operators() {
+	read -p "Ask someone to approve all of the operator PRs, then press Enter"
 	while IFS="" read -r operator || [ -n "$operator" ]; do
 		echo "Operator: $operator"
 		if $PUSH; then
@@ -58,7 +59,6 @@ merge_operators() {
 				echo "Reviewing..."
 				# TODO (@NickLarsenNZ): Check if the review is merged, else loop the following
 				# TODO (@NickLarsenNZ): Allow review if the PR author is not the current `gh` user, otherwise wait.
-				read -p "Ask someone to approve the PR, then press Enter"
 				# gh pr review "${PR_BRANCH}" --approve -R stackabletech/"${operator}"
 				echo "Merging..."
 				gh pr merge "${PR_BRANCH}" --delete-branch --squash -R stackabletech/"${operator}"

release/tag-release-candidate.sh

@@ -17,15 +17,15 @@ tag_products() {
 	cd "$TEMP_RELEASE_FOLDER/$DOCKER_IMAGES_REPO"
 
 	# the PR branch should already exist
-	git switch "$RELEASE_BRANCH"
+	git switch "$RELEASE_BRANCH" && git pull
 	git tag -sm "release $RELEASE_TAG" "$RELEASE_TAG"
 	push_branch
 }
 
 tag_operators() {
 	while IFS="" read -r operator || [ -n "$operator" ]; do
 		cd "${TEMP_RELEASE_FOLDER}/${operator}"
-		git switch "$RELEASE_BRANCH"
+		git switch "$RELEASE_BRANCH" && git pull
 		git tag -sm "release $RELEASE_TAG" "$RELEASE_TAG"
 		push_branch
 	done < <(yq '... comments="" | .operators[] ' "$INITIAL_DIR"/release/config.yaml)