Skip to content

Makefile buff-ification #3700

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 14 commits into from
Sep 2, 2022
Merged

Makefile buff-ification #3700

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
73e4db4
chore: buff makefile pt. 1
deansheather Aug 26, 2022
8765bc4
chore: buff makefile pt. 2
deansheather Aug 26, 2022
e208509
chore: buff makefile pt. 3 docker
deansheather Aug 26, 2022
5a5cd1d
fixup! chore: buff makefile pt. 3 docker
deansheather Aug 26, 2022
29de6ce
chore: buff makefile pt. 4 make install
deansheather Aug 26, 2022
7a0f045
chore: buff makefile pt. 5 helm stuff
deansheather Aug 28, 2022
f866e1f
fixup! chore: buff makefile pt. 5 helm stuff
deansheather Aug 28, 2022
b81712b
fixup! chore: buff makefile pt. 5 helm stuff
deansheather Aug 29, 2022
c7317f4
chore: add makefile docs
deansheather Aug 29, 2022
317e80d
chore: fix release makefile stuff
deansheather Aug 29, 2022
ec1c10a
fixup! chore: fix release makefile stuff
deansheather Aug 29, 2022
a6f1b4c
chore: remove make bin target
deansheather Sep 1, 2022
6e4a441
Merge branch 'main' into buff-makefile
deansheather Sep 1, 2022
9cddd8a
Merge branch 'main' into buff-makefile
deansheather Sep 2, 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
chore: buff makefile pt. 4 make install
  • Loading branch information
@deansheather
deansheather committed Aug 26, 2022
commit 29de6ced14e27f4e08ebe754695676ea850cea98
31 changes: 11 additions & 20 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ifndef VERBOSE
.SILENT:
endif

# Create the build directory if it does not exist.
$(shell mkdir -p build)
# Create the output directories if they do not exist.
$(shell mkdir -p build site/out/bin)

INSTALL_DIR := $(shell go env GOPATH)/bin
GOOS := $(shell go env GOOS)
GOARCH := $(shell go env GOARCH)
GOOS_BIN_EXT := $(if $(filter windows, $(GOOS)),.exe,)
VERSION := $(shell ./scripts/version.sh)

# All ${OS}_${ARCH} combos we build for. Windows binaries have the .exe suffix.
Expand Down Expand Up @@ -63,8 +63,9 @@ CODER_ALL_NOVERSION_IMAGES_PUSHED := $(addprefix push/, $(CODER_ALL_NOVERSION_IM


clean:
rm -rf build
mkdir -p build
rm -rf build site/out
mkdir -p build site/out/bin
git restore site/out
.PHONY: clean

build-slim bin: $(CODER_SLIM_BINARIES)
Expand Down Expand Up @@ -320,22 +321,12 @@ fmt: fmt/prettier fmt/terraform fmt/shfmt
gen: coderd/database/querier.go peerbroker/proto/peerbroker.pb.go provisionersdk/proto/provisioner.pb.go provisionerd/proto/provisionerd.pb.go site/src/api/typesGenerated.ts
.PHONY: gen

install: site/out/index.html $(shell find . -not -path './vendor/*' -type f -name '*.go') go.mod go.sum $(shell find ./examples/templates)
output_file="$(INSTALL_DIR)/coder"
install: build/coder_$(VERSION)_$(GOOS)_$(GOARCH)$(GOOS_BIN_EXT)
install_dir="$$(go env GOPATH)/bin"
output_file="$${install_dir}/coder$(GOOS_BIN_EXT)"

if [[ "$(GOOS)" == "windows" ]]; then
output_file="$${output_file}.exe"
fi

echo "-- Building CLI for $(GOOS) $(GOARCH) at $$output_file"

./scripts/build_go.sh \
--version "$(VERSION)" \
--output "$$output_file" \
--os "$(GOOS)" \
--arch "$(GOARCH)"

echo
mkdir -p "$$install_dir"
cp "$<" "$$output_file"
.PHONY: install

lint: lint/shellcheck lint/go
Expand Down