chore: fix release makefile stuff

coder · deansheather · Sep 2, 2022 · Aug 26, 2022 · Aug 26, 2022 · Aug 26, 2022
commit 317e80dd5fd928e5fc85786f5bad8e333e71a0ab
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -198,7 +198,7 @@ jobs:
           make -j \
             build/coder_"$version"_darwin_{amd64,arm64}.zip
         env:
-          CODER_SIGN_DARWIN: "true"
+          CODER_SIGN_DARWIN: "1"
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
           AC_APPLICATION_IDENTITY: BDB050EB749EDD6A80C6F119BF1382ECA119CCCC

diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@
 # - build-fat: builds all "fat" binaries for all architectures
 # - build-slim: builds all "slim" binaries (no frontend or slim binaries
 #   embedded) for all architectures
+# - release: simulate a release (mostly, does not push images)
 # - build/coder(-slim)?_${os}_${arch}(.exe)?: build a single fat binary
 # - build/coder_${os}_${arch}.(zip|tar.gz): build a release archive
 # - build/coder_linux_${arch}.(apk|deb|rpm): build a release Linux package
@@ -45,7 +46,7 @@ OS_ARCHES := \
 # Archive formats and their corresponding ${OS}_${ARCH} combos.
 ARCHIVE_TAR_GZ := linux_amd64 linux_arm64 linux_armv7
 ARCHIVE_ZIP    := \
-	darwin darwin_arm64 \
+	darwin_amd64 darwin_arm64 \
 	windows_amd64 windows_arm64
 
 # All package formats we build and the ${OS}_${ARCH} combos we build them for.
@@ -87,6 +88,9 @@ build-slim bin: $(CODER_SLIM_BINARIES)
 build-fat build-full build: $(CODER_FAT_BINARIES)
 .PHONY: build-fat build-full build
 
+release: $(CODER_FAT_BINARIES) $(CODER_ALL_ARCHIVES) $(CODER_ALL_PACKAGES) $(CODER_ALL_ARCH_IMAGES) build/coder_helm_$(VERSION).tgz
+.PHONY: release
+
 build/coder-slim_$(VERSION)_checksums.sha1: $(CODER_SLIM_BINARIES)
 	pushd ./build
 		openssl dgst -r -sha1 coder-slim_"$(VERSION)"_* | tee "$(@F)"
@@ -216,14 +220,18 @@ $(CODER_ALL_ARCHIVES): $(CODER_FAT_BINARIES)
 
 # This task builds all packages. It parses the target name to get the metadata
 # for the build, so it must be specified in this format:
-#     build/coder_${version}_${os}_${arch}.${format}
+#     build/coder_${version}_linux_${arch}.${format}
 #
 # Supports apk, deb, rpm for all linux targets.
 #
-# This depends on all fat binaries because it's difficult to do dynamic
-# dependencies due to the extensions in the filenames. These targets are
-# typically only used during release anyways.
-$(CODER_ALL_PACKAGES): $(CODER_FAT_BINARIES)
+# This depends on all Linux fat binaries and archives because it's difficult to
+# do dynamic dependencies due to the extensions in the filenames. These targets
+# are typically only used during release anyways.
+#
+# Packages need to run after the archives are built, otherwise they cause tar
+# errors like "file changed as we read it".
+CODER_PACKAGE_DEPS := $(foreach os_arch, $(PACKAGE_OS_ARCHES), build/coder_$(VERSION)_$(os_arch) build/coder_$(VERSION)_$(os_arch).tar.gz)
+$(CODER_ALL_PACKAGES): $(CODER_PACKAGE_DEPS)
 	$(get-mode-os-arch-ext)
 
 	./scripts/package.sh \
@@ -252,7 +260,16 @@ $(CODER_ALL_NOVERSION_IMAGES_PUSHED): push/build/coder_%: push/build/coder_$(VER
 #     build/coder_${version}_${os}_${arch}.tag
 #
 # Supports linux_amd64, linux_arm64, linux_armv7.
-$(CODER_ALL_ARCH_IMAGES): build/coder_$(VERSION)_%.tag: build/coder_$(VERSION)_%
+#
+# Images need to run after the archives and packages are built, otherwise they
+# cause errors like "file changed as we read it".
+$(CODER_ALL_ARCH_IMAGES): build/coder_$(VERSION)_%.tag: \
+	build/coder_$(VERSION)_% \
+	build/coder_$(VERSION)_%.apk \
+	build/coder_$(VERSION)_%.deb \
+	build/coder_$(VERSION)_%.rpm \
+	build/coder_$(VERSION)_%.tar.gz
+
 	$(get-mode-os-arch-ext)
 
 	image_tag="$$(./scripts/image_tag.sh --arch "$$arch" --version "$(VERSION)")"

diff --git a/scripts/archive.sh b/scripts/archive.sh
@@ -3,7 +3,7 @@
 # This script creates an archive containing the given binary renamed to
 # `coder(.exe)?`, as well as the README.md and LICENSE files from the repo root.
 #
-# Usage: ./archive.sh --format tar.gz [--output path/to/output.tar.gz] [--sign-darwin] [--agpl] path/to/binary
+# Usage: ./archive.sh --format tar.gz --os linux/darwin/windows [--output path/to/output.tar.gz] [--sign-darwin] [--agpl] path/to/binary
 #
 # The --format parameter must be set, and must either be "zip" or "tar.gz".
 #
@@ -28,9 +28,10 @@ source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 format=""
 output_path=""
 sign_darwin="${CODER_SIGN_DARWIN:-0}"
+os=""
 agpl="${CODER_BUILD_AGPL:-0}"
 
-args="$(getopt -o "" -l format:,output:,sign-darwin,agpl -- "$@")"
+args="$(getopt -o "" -l format:,output:,sign-darwin,os:,agpl -- "$@")"
 eval set -- "$args"
 while true; do
 	case "$1" in
@@ -47,10 +48,11 @@ while true; do
 		output_path="$(realpath "$2")"
 		shift 2
 		;;
+	--os)
+		os="$2"
+		shift 2
+		;;
 	--sign-darwin)
-		if [[ "${AC_APPLICATION_IDENTITY:-}" == "" ]]; then
-			error "AC_APPLICATION_IDENTITY must be set when --sign-darwin is supplied"
-		fi
 		sign_darwin=1
 		shift
 		;;
@@ -80,6 +82,11 @@ if [[ ! -f "$1" ]]; then
 fi
 input_file="$(realpath "$1")"
 
+sign_darwin="$([[ "$sign_darwin" == 1 ]] && [[ "$os" == "darwin" ]] && echo 1 || echo 0)"
+if [[ "$sign_darwin" == 1 ]] && [[ "${AC_APPLICATION_IDENTITY:-}" == "" ]]; then
+	error "AC_APPLICATION_IDENTITY must be set when --sign-darwin or CODER_SIGN_DARWIN=1 is supplied"
+fi
+
 # Check dependencies
 if [[ "$format" == "zip" ]]; then
 	dependencies zip