fixup! chore: update release workflow to use new build scripts

deansheather · deansheather · commit 4f03e370beee · 2022-06-12T22:37:17.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ on:
 # In a non-snapshot we want the ./scripts/version.sh script to never generate a
 # +dev version.
 env:
-  CODER_NO_DEV_VERSION: ${{ github.event.inputs.snapshot && '' || 'true' }}
+  CODER_NO_DEV_VERSION: ${{ github.event.inputs.snapshot && 'false' || 'true' }}
 
 jobs:
   linux-windows:
diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -57,8 +57,10 @@ cdroot() {
 # be sourced by other scripts.
 execrelative() {
 	pushd "$SCRIPT_DIR" || error "Could not change directory to '$SCRIPT_DIR'"
-	"$@"
+	rc=0
+	"$@" || rc=$?
 	popd
+	return $rc
 }
 
 # maybedryrun prints the given program and flags, and then, if the first
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -20,7 +20,14 @@ version="$last_tag"
 # Dev versions are denoted by the "+dev." suffix with a trailing commit short
 # SHA.
 if [[ "$last_tag" != "$current" ]]; then
-	if [[ "${CODER_NO_DEV_VERSION:-}" != "" ]]; then
+	if [[ "${CODER_NO_DEV_VERSION:-}" == *t* ]]; then
+		# make won't exit on $(shell cmd) failures :(
+		if [[ "$(ps -o comm= "$PPID" || true)" == *make* ]]; then
+			log "ERROR: version.sh attemped to generate a dev version string when CODER_NO_DEV_VERSION was set"
+			kill "$PPID"
+			exit 1
+		fi
+
 		error "version.sh attemped to generate a dev version string when CODER_NO_DEV_VERSION was set"
 	fi
 	version+="+dev.$(git rev-parse --short HEAD)"
