Skip to content

chore: parallel builds with Makefile #3854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 6, 2022
Merged

chore: parallel builds with Makefile #3854

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72dec5d
Revert "revert: Makefile buff-ification (#3700) (#3848)"
deansheather Sep 3, 2022
cfb914c
fix: fix slim targets in makefile
deansheather Sep 3, 2022
639d846
fix: don't clobber slim binaries, make sure they're in the correct lo…
deansheather Sep 6, 2022
62dde90
fixup! fix: don't clobber slim binaries, make sure they're in the cor…
deansheather Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix slim targets in makefile
  • Loading branch information
@deansheather
deansheather committed Sep 3, 2022
commit cfb914ca0f0344f11f3e6be6e3c928a921cce688
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,19 @@ build-fat build-full build: $(CODER_FAT_BINARIES)
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)
build/coder-slim_$(VERSION)_checksums.sha1 site/out/bin/coder.sha1: $(CODER_SLIM_BINARIES)
pushd ./build
openssl dgst -r -sha1 coder-slim_"$(VERSION)"_* | tee "$(@F)"
openssl dgst -r -sha1 coder-slim_"$(VERSION)"_* | tee "coder-slim_$(VERSION)_checksums.sha1"
popd

cp "build/coder-slim_$(VERSION)_checksums.sha1" "site/out/bin/coder.sha1"

build/coder-slim_$(VERSION).tar: build/coder-slim_$(VERSION)_checksums.sha1 $(CODER_SLIM_BINARIES)
pushd ./build
tar cf "$(@F)" coder-slim_"$(VERSION)"_*
popd

build/coder-slim_$(VERSION).tar.zst site/out/coder.tar.zst: build/coder-slim_$(VERSION).tar
build/coder-slim_$(VERSION).tar.zst site/out/bin/coder.tar.zst: build/coder-slim_$(VERSION).tar
zstd -6 \
--force \
--ultra \
Expand All @@ -110,7 +112,7 @@ build/coder-slim_$(VERSION).tar.zst site/out/coder.tar.zst: build/coder-slim_$(V
-o "build/coder-slim_$(VERSION).tar.zst" \
"build/coder-slim_$(VERSION).tar"

cp "build/coder-slim_$(VERSION).tar.zst" "site/out/coder.tar.zst"
cp "build/coder-slim_$(VERSION).tar.zst" "site/out/bin/coder.tar.zst"
# delete the uncompressed binaries from the embedded dir
rm site/out/coder-*

Expand All @@ -134,7 +136,7 @@ $(CODER_SLIM_NOVERSION_BINARIES): build/coder-slim_%: build/coder-slim_$(VERSION
ln "$<" "$@"

# "fat" binaries always depend on the site and the compressed slim binaries.
$(CODER_FAT_BINARIES): site/out/index.html site/out/coder.tar.zst
$(CODER_FAT_BINARIES): site/out/index.html site/out/bin/coder.tar.zst

# This is a handy block that parses the target to determine whether it's "slim"
# or "fat", which OS was specified and which architecture was specified.
Expand Down