fixup! chore: integrate docker into pipeline

coder · deansheather · Jun 18, 2022 · Jun 7, 2022 · Jun 8, 2022 · Jun 8, 2022
commit 0907c37f92d37a69da9c6a0dcb9904087ca66314
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,11 +21,8 @@ on:
         type: boolean
         required: true
 
-# In a non-snapshot we want the ./scripts/version.sh script to never generate a
-# +dev version.
 env:
-  CODER_FORCE_DEV_VERSION: ${{ github.event.inputs.snapshot && 'true' || 'false' }}
-  CODER_NO_DEV_VERSION: ${{ github.event.inputs.snapshot && 'false' || 'true' }}
+  CODER_RELEASE: ${{ github.event.inputs.snapshot && 'false' || 'true' }}
 
 jobs:
   linux-windows:
@@ -79,14 +76,14 @@ jobs:
 
       - name: Build Linux Docker images
         run: |
-          set -euo pipefail
+          set -euxo pipefail
 
           # build and push Docker images for each architecture
           images=()
           for arch in amd64 armv7 arm64; do
             img="$(
               ./scripts/build_docker.sh \
-                ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot && '--push' }} \
+                ${{ (!github.event.inputs.dry_run && !github.event.inputs.snapshot) && '--push' || '' }} \
                 --arch "$arch" \
                 ./dist/coder_*_linux_"$arch"
             )"
@@ -95,7 +92,7 @@ jobs:
 
           # build and push multi-arch manifest
           ./scripts/build_docker_multiarch.sh \
-            ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot && '--push' }} \
+            ${{ (!github.event.inputs.dry_run && !github.event.inputs.snapshot) && '--push' || '' }} \
             "${images[@]}"
 
           # if the current version is equal to the highest (according to semver)
@@ -104,7 +101,7 @@ jobs:
           if [[ "$(git tag | grep '^v' | grep -vE '(rc|dev|-|\+|\/)' | sort -r --version-sort | head -n1)" == "v$(./scripts/version.sh)" ]]; then
             ./scripts/build_docker_multiarch.sh \
               --target "$(./scripts/image_tag.sh --version latest)" \
-              ${{ !github.event.inputs.dry_run && !github.event.inputs.snapshot && '--push' }} \
+              ${{ (!github.event.inputs.dry_run && !github.event.inputs.snapshot) && '--push' || '' }} \
               "${images[@]}"
           fi
 

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -4,38 +4,37 @@
 # versions. Note: the version returned by this script will NOT include the "v"
 # prefix that is included in the Git tag.
 #
-# If $CODER_FORCE_DEV_VERSION is set to "true", the returned version will be a
-# dev version even if the current commit is tagged.
+# If $CODER_RELEASE is set to "true", the returned version will equal the
+# current git tag. If the current commit is not tagged, this will fail.
 #
-# If $CODER_NO_DEV_VERSION is set to "true", the script will fail if the current
-# commit is not tagged.
+# If $CODER_RELEASE is not set, the returned version will always be a dev
+# version.
 
 set -euo pipefail
 # shellcheck source=scripts/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 cdroot
 
-# $current will equal $last_tag if we currently have the tag checked out.
-last_tag="$(git describe --tags --abbrev=0)"
-current="$(git describe --always)"
-
-version="$last_tag"
+version="$(git describe --tags --abbrev=0)"
 
 # If the HEAD has extra commits since the last tag then we are in a dev version.
 #
 # Dev versions are denoted by the "-devel+" suffix with a trailing commit short
 # SHA.
-if [[ "${CODER_FORCE_DEV_VERSION:-}" == *t* ]] || [[ "$last_tag" != "$current" ]]; then
-	if [[ "${CODER_NO_DEV_VERSION:-}" == *t* ]]; then
-		# make won't exit on $(shell cmd) failures :(
+if [[ "${CODER_RELEASE:-}" == *t* ]]; then
+	# $version will equal `git describe --always` if we currently have the tag
+	# checked out.
+	if [[ "$version" != "$(git describe --always)" ]]; then
+		# make won't exit on $(shell cmd) failures, so we have to kill it :(
 		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"
+			log "ERROR: version.sh attemped to generate a dev version string when CODER_RELEASE was set"
 			kill "$PPID" || true
 			exit 1
 		fi
 
-		error "version.sh attemped to generate a dev version string when CODER_NO_DEV_VERSION was set"
+		error "version.sh attemped to generate a dev version string when CODER_RELEASE was set"
 	fi
+else
 	version+="-devel+$(git rev-parse --short HEAD)"
 fi