ci: allow commits during release automation

Problem:
Commits to "master" branch will cause release automation to fail. This
requires us to "freeze" mainline until the release completes.

Solution:
Before pushing, fetch from upstream. Then do a non-fast-forward merge if
necessary.

Author: justinmk3

buildspec/release/40pushtogithub.yml

@@ -36,9 +36,11 @@ phases:
                 git commit -m "Update version to snapshot version: ${VERSION}-SNAPSHOT"
             - |
                 if [ "$STAGE" != "prod" ]; then
-                  echo "Stage is not production, skipping github push step"
+                  echo "SKIPPED (stage=${STAGE}): 'git push originWithCreds ${TARGET_BRANCH}'"
                   exit 0
                 fi
                 echo "pushing to github"
                 git push originWithCreds --tags
+                git fetch originWithCreds ${TARGET_BRANCH}
+                git merge --no-edit -m "Merge release into ${TARGET_BRANCH}" FETCH_HEAD
                 git push originWithCreds ${TARGET_BRANCH}

buildspec/release/50githubrelease.yml

@@ -41,5 +41,5 @@ phases:
                   # note: the tag arg passed here should match what is in 10changeversion.yml
                   gh release create --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
                 else
-                  echo "SKIPPED: 'gh release create --repo $REPO'"
+                  echo "SKIPPED (stage=${STAGE}): 'gh release create --repo $REPO'"
                 fi

buildspec/release/60publish.yml

@@ -28,14 +28,14 @@ phases:
             - |
                 echo "Publishing to vscode marketplace: $UPLOAD_TARGET"
                 if [ "$STAGE" != "prod" ]; then
-                  echo "skipped (stage=${STAGE})"
+                  echo "SKIPPED (stage=${STAGE}): 'npx vsce publish --pat xxx --packagePath ${UPLOAD_TARGET}'"
                 else
                   npx vsce publish --pat "$VS_MARKETPLACE_PAT" --packagePath "$UPLOAD_TARGET"
                 fi
             - |
                 echo "Publishing to openvsx marketplace: $UPLOAD_TARGET"
                 if [ "$STAGE" != "prod" ]; then
-                  echo "skipped (stage=${STAGE})"
+                  echo "SKIPPED (stage=${STAGE}): 'npx --yes ovsx publish --pat xxx "${UPLOAD_TARGET}"'"
                 else
-                  npx --yes ovsx publish "$UPLOAD_TARGET" -p "$OVSX_PAT"
+                  npx --yes ovsx publish --pat "$OVSX_PAT" "$UPLOAD_TARGET"
                 fi