Make workflow patches less brittle. (#97)

Author: cjyar

.github/bump-version.bump.sh

@@ -34,8 +34,8 @@ for V in ${CURRENTVERS} ${RELEASEVERS} ; do
         echo "Illegal zero version '${V}'" 1>&2
         exit 1
     fi
-    # Sanity check: Must be valid semver.
-    if ! [[ ${V} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]] ; then
+    # Sanity check: Must start with a valid semver.
+    if ! [[ ${V} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))? ]] ; then
         echo "Invalid version '${V}'" 1>&2
         exit 1
     fi
@@ -48,27 +48,24 @@ if [ -z "${RELEASEVERS}" ] ; then
         RELEASEVERS="${CURRENTVERS/-*}"
         ;;
     "prerelease")
-        # Split "1.2.3-pre.4" into "1.2.3" and "pre.4".
-        read -r PRE POST < <(echo "${CURRENTVERS/-/ }")
-        # Remove non-numeric parts of "pre.4" like "pre".
-        POST="$(echo "${POST}" | sed -e 's/[^0-9.]//g' -e 's/\.*$//')"
-        # Remove leading, trailing, or repeated "." characters.
-        POST="$(echo "${POST}" | sed -e 's/^\.*//' -e 's/\.*$//' -e 's/\.\.*/./g')"
-        if [ "${POST}" = "" ] ; then
-            POST="0"
+        # Replace [-.]pre[-.$] with [-.]rc[-.$].
+        RELEASEVERS="$(echo "${CURRENTVERS}" | sed -E 's/([-.])pre([-.]|$)/\1rc\2/')"
+        # If no [-.]rc[-.$], append -rc.0.
+        if ! [[ ${RELEASEVERS} =~ [-.]rc([-.]|$) ]] ; then
+            RELEASEVERS="${RELEASEVERS}-rc.0"
         fi
-        # Set "1.2.3-rc.4".
-        RELEASEVERS="${PRE}-rc.${POST}"
         ;;
     esac
 fi
 echo "::set-output name=release::${RELEASEVERS}"
 
 # Derive a new bumped version from the release version.
-# Change "1.2.3-rc.4" to "1.2.3.4".
-VERSION="$(echo "${RELEASEVERS}" | sed -e 's/-/./g' -e 's/rc//' -e 's/\.\.*/./g')"
-# Increment "1.2.3.4" to "1.2.3.5".
-VERSION="$(echo "${VERSION}" | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-# Convert back to valid semver syntax "1.2.3-pre.5".
-VERSION="$(echo "${VERSION}" | sed -e 's/\([^.]*\)\.\([^.]*\)\.\([^.]*\)\(\.\(.*\)\)\{0,1\}/\1.\2.\3-pre.\5/' -e 's/\.$//')"
+# Increment the last number in the string.
+VERSION="$(echo "${RELEASEVERS}" | gawk '{ start=match($0, /(.*)([0-9]+)([^0-9]*)$/, a) ; a[2] += 1 ; printf("%s%s%s", a[1], a[2], a[3]) }')"
+# Replace [-.]rc[-.$] with pre.
+VERSION="$(echo "${VERSION}" | sed -E 's/([-.])rc([-.]|$)/\1pre\2/')"
+# If no [-.]pre[-.$], then append -pre.
+if ! [[ ${VERSION} =~ [-.]pre([-.]|$) ]] ; then
+    VERSION="${VERSION}-pre"
+fi
 echo "::set-output name=bumped::${VERSION}"

.github/bump-version.get.sh

@@ -98,8 +98,8 @@ if [ "${CURRENTVERS/-*/}" = "0.0.0" ] ; then
     echo "Illegal zero version '${CURRENTVERS}'" 1>&2
     exit 1
 fi
-# Sanity check: Must be valid semver.
-if ! [[ ${CURRENTVERS} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$ ]] ; then
+# Sanity check: Must start with a valid semver.
+if ! [[ ${CURRENTVERS} =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))? ]] ; then
     echo "Invalid version '${CURRENTVERS}'" 1>&2
     exit 1
 fi

.github/typescript-ci-patch.yaml

@@ -42,6 +42,9 @@
   value: "${{ matrix.system.os }}"
 
 # These steps are lifted from the Rust CI workflow, cargo-test job.
+- op: test
+  path: /jobs/test/steps/2/name
+  value: Install modules
 - op: add
   path: /jobs/test/steps/2
   value:
@@ -62,6 +65,9 @@
     run: yarn run compile
 
 # Only check coverage in one of the matrix job instances.
+- op: test
+  path: /jobs/test/steps/6/name
+  value: Check test coverage
 - op: add
   path: /jobs/test/steps/6/if
   value: ${{ contains(matrix.system.os, 'ubuntu') && matrix.node_version == '16' && matrix.rust_version == 'stable' && github.base_ref != '' }}
@@ -98,12 +104,21 @@
   value:
     run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
 # We don't need to run setup-node inside of a node docker image.
+- op: test
+  path: /jobs/test-docker/steps/3/uses
+  value: actions/setup-node@v3
 - op: remove
   path: /jobs/test-docker/steps/3
 # No need to check test coverage here, since we do it in the first matrix build.
+- op: test
+  path: /jobs/test-docker/steps/7/name
+  value: Check test coverage
 - op: remove
   path: /jobs/test-docker/steps/7
 
+- op: test
+  path: /jobs/test/steps/6/name
+  value: Check test coverage
 - op: replace
   path: /jobs/test/steps/6/with/afterSwitchCommand
-  value: yarn install --ignore-scripts && yarn run compile
+  value: yarn install --ignore-scripts && yarn run compile

.github/workflows/update-workflows.yaml

@@ -72,9 +72,9 @@ jobs:
         \ ] ; then\n  (\n    echo \"- op: replace\"\n    echo \"  path: /on/schedule/0/cron\"\
         \n    echo \"  value: \\\"$(( $RANDOM % 60 )) 7 * * 1\\\"\"\n  ) > thisrepo/.github/update-workflows-patch.yaml\n\
         \  # \"git add\" and commit will be taken care of below.\nfi\nif [ -f thisrepo/.github/workflows/rebuild.yaml\
-        \ ] && ! [ -f thisrepo/.github/workflows/rebuild-patch.yaml ] ; then\n  (\n\
-        \    echo \"- op: replace\"\n    echo \"  path: /on/schedule/0/cron\"\n  \
-        \  echo \"  value: \\\"$(( $RANDOM % 60 )) 16 * * 2\\\"\"\n  ) > thisrepo/.github/rebuild-patch.yaml\n\
+        \ ] && ! [ -f thisrepo/.github/rebuild-patch.yaml ] ; then\n  (\n    echo\
+        \ \"- op: replace\"\n    echo \"  path: /on/schedule/0/cron\"\n    echo \"\
+        \  value: \\\"$(( $RANDOM % 60 )) 16 * * 2\\\"\"\n  ) > thisrepo/.github/rebuild-patch.yaml\n\
         fi\n"
     - name: Update workflows
       id: update