From 115e3f5fd57d4f5e8d59d4d3fedf233b5853ab55 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 15 Dec 2022 15:58:44 +0000 Subject: [PATCH 1/2] build: Fix parallelism of make -j build --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f67512b96cffa..3a13c855c78e9 100644 --- a/Makefile +++ b/Makefile @@ -101,19 +101,23 @@ build-fat build-full build: $(CODER_FAT_BINARIES) release: $(CODER_FAT_BINARIES) $(CODER_ALL_ARCHIVES) $(CODER_ALL_PACKAGES) $(CODER_ARCH_IMAGES) build/coder_helm_$(VERSION).tgz .PHONY: release -build/coder-slim_$(VERSION)_checksums.sha1 site/out/bin/coder.sha1: $(CODER_SLIM_BINARIES) +build/coder-slim_$(VERSION)_checksums.sha1: site/out/bin/coder.sha1 + cp "site/out/bin/coder.sha1" "build/coder-slim_$(VERSION)_checksums.sha1" + +site/out/bin/coder.sha1: $(CODER_SLIM_BINARIES) pushd ./site/out/bin openssl dgst -r -sha1 coder-* | tee coder.sha1 popd - cp "site/out/bin/coder.sha1" "build/coder-slim_$(VERSION)_checksums.sha1" - build/coder-slim_$(VERSION).tar: build/coder-slim_$(VERSION)_checksums.sha1 $(CODER_SLIM_BINARIES) pushd ./site/out/bin tar cf "../../../build/$(@F)" coder-* popd -build/coder-slim_$(VERSION).tar.zst site/out/bin/coder.tar.zst: build/coder-slim_$(VERSION).tar +site/out/bin/coder.tar.zst: build/coder-slim_$(VERSION).tar.zst + cp "build/coder-slim_$(VERSION).tar.zst" "site/out/bin/coder.tar.zst" + +build/coder-slim_$(VERSION).tar.zst: build/coder-slim_$(VERSION).tar zstd $(ZSTDFLAGS) \ --force \ --long \ @@ -121,7 +125,6 @@ build/coder-slim_$(VERSION).tar.zst site/out/bin/coder.tar.zst: build/coder-slim -o "build/coder-slim_$(VERSION).tar.zst" \ "build/coder-slim_$(VERSION).tar" - cp "build/coder-slim_$(VERSION).tar.zst" "site/out/bin/coder.tar.zst" # delete the uncompressed binaries from the embedded dir rm site/out/bin/coder-* From 613eee7daaa7beaad3e66dac7673bfc1cacf5de9 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 15 Dec 2022 16:23:30 +0000 Subject: [PATCH 2/2] Adress PR comments --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3a13c855c78e9..5936b158fd71c 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ release: $(CODER_FAT_BINARIES) $(CODER_ALL_ARCHIVES) $(CODER_ALL_PACKAGES) $(COD .PHONY: release build/coder-slim_$(VERSION)_checksums.sha1: site/out/bin/coder.sha1 - cp "site/out/bin/coder.sha1" "build/coder-slim_$(VERSION)_checksums.sha1" + cp "$<" "$@" site/out/bin/coder.sha1: $(CODER_SLIM_BINARIES) pushd ./site/out/bin @@ -115,7 +115,7 @@ build/coder-slim_$(VERSION).tar: build/coder-slim_$(VERSION)_checksums.sha1 $(CO popd site/out/bin/coder.tar.zst: build/coder-slim_$(VERSION).tar.zst - cp "build/coder-slim_$(VERSION).tar.zst" "site/out/bin/coder.tar.zst" + cp "$<" "$@" build/coder-slim_$(VERSION).tar.zst: build/coder-slim_$(VERSION).tar zstd $(ZSTDFLAGS) \