fixup! chore: integrate docker into pipeline

deansheather · deansheather · commit 4a94e25c612a · 2022-06-16T16:08:29.000Z
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -78,7 +78,7 @@ jobs:
         run: |
           set -euxo pipefail
 
-          # build and push Docker images for each architecture
+          # build and (maybe) push Docker images for each architecture
           images=()
           for arch in amd64 armv7 arm64; do
             img="$(
@@ -90,18 +90,25 @@ jobs:
             images+=("$img")
           done
 
+          # we can't build multi-arch if the images aren't pushed, so quit now
+          # if dry-running
+          if [[ "$CODER_RELEASE" != *t* ]]; then
+            echo Skipping multi-arch docker builds due to dry-run.
+            exit 0
+          fi
+
           # build and push multi-arch manifest
           ./scripts/build_docker_multiarch.sh \
-            ${{ (!github.event.inputs.dry_run && !github.event.inputs.snapshot) && '--push' || '' }} \
+            --push \
             "${images[@]}"
 
           # if the current version is equal to the highest (according to semver)
           # version in the repo, also create a multi-arch image as ":latest" and
           # push it
           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 \
+              --push \
               --target "$(./scripts/image_tag.sh --version latest)" \
-              ${{ (!github.event.inputs.dry_run && !github.event.inputs.snapshot) && '--push' || '' }} \
               "${images[@]}"
           fi
 
diff --git a/scripts/publish_release.sh b/scripts/publish_release.sh
@@ -71,6 +71,10 @@ if [[ "${#files[@]}" == 0 ]]; then
 	error "No files supplied"
 fi
 
+if [[ "$dry_run" == 0 ]] && [[ "$version" == *dev* ]]; then
+	error "Cannot publish a dev version to GitHub"
+fi
+
 # The git commands need to be executed from within the repository.
 cdroot
 
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -15,16 +15,17 @@ set -euo pipefail
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 cdroot
 
-version="$(git describe --tags --abbrev=0)"
+last_tag="$(git describe --tags --abbrev=0)"
+version="$last_tag"
 
 # 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_RELEASE:-}" == *t* ]]; then
-	# $version will equal `git describe --always` if we currently have the tag
+	# $last_tag will equal `git describe --always` if we currently have the tag
 	# checked out.
-	if [[ "$version" != "$(git describe --always)" ]]; then
+	if [[ "$last_tag" != "$(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_RELEASE was set"
