Skip to content

Commit 5684a89

Browse files
authored
build: fix Makefile (#211)
Add image registry to `make test` and use `gsed` instead of `sed` on macOS to keep the command compatible across platforms.
1 parent a0afb92 commit 5684a89

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ HELM_CHART_DIR ?= charts/oxide-cloud-controller-manager
2323
HELM_CHART_REGISTRY ?= oci://ghcr.io/oxidecomputer/helm-charts
2424
HELM ?= go tool -modfile tools/go.mod helm
2525

26+
SED := sed
27+
OS := $(shell uname)
28+
ifeq ($(OS), Darwin)
29+
SED := gsed
30+
endif
31+
2632
.PHONY: test
2733
test:
2834
@echo "Running tests in container..."
@@ -33,7 +39,7 @@ test:
3339
--target builder \
3440
--tag $(if $(IMAGE_REGISTRY),$(IMAGE_REGISTRY)/)$(IMAGE_NAME)-builder:$(IMAGE_TAG) \
3541
.
36-
$(CONTAINER_RUNTIME) run --rm $(IMAGE_NAME)-builder:$(IMAGE_TAG) go test -v ./...
42+
$(CONTAINER_RUNTIME) run --rm $(if $(IMAGE_REGISTRY),$(IMAGE_REGISTRY)/)$(IMAGE_NAME)-builder:$(IMAGE_TAG) go test -v ./...
3743

3844
.PHONY: build
3945
build:
@@ -54,8 +60,8 @@ push:
5460

5561
.PHONY: helm-set-version
5662
helm-set-version:
57-
@sed -i 's/^version: .*/version: "$(patsubst v%,%,$(VERSION))"/' $(HELM_CHART_DIR)/Chart.yaml
58-
@sed -i 's/^appVersion: .*/appVersion: "$(patsubst v%,%,$(VERSION))"/' $(HELM_CHART_DIR)/Chart.yaml
63+
@$(SED) -i 's/^version: .*/version: "$(patsubst v%,%,$(VERSION))"/' $(HELM_CHART_DIR)/Chart.yaml
64+
@$(SED) -i 's/^appVersion: .*/appVersion: "$(patsubst v%,%,$(VERSION))"/' $(HELM_CHART_DIR)/Chart.yaml
5965

6066
.PHONY: manifest
6167
manifest: helm-set-version

0 commit comments

Comments
 (0)