Skip to content

Commit

Permalink
test: another patch
Browse files Browse the repository at this point in the history
Signed-off-by: Ramkumar Chinchani <[email protected]>
  • Loading branch information
rchincha committed Jan 17, 2024
1 parent ca5126a commit a31c9e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ BATS_VERSION := v1.10.0
ZOT := $(TOOLS_D)/bin/zot
ZOT_VERSION := v2.0.0

export PATH := $(TOOLS_D):$(PATH)
export PATH := $(TOOLS_D)/bin:$(PATH)

GOLANGCI_LINT_VERSION = v1.54.2
GOLANGCI_LINT = $(TOOLS_D)/golangci-lint/$(GOLANGCI_LINT_VERSION)/golangci-lint
Expand Down Expand Up @@ -110,7 +110,7 @@ go-test:
go tool cover -html coverage.txt -o $(HACK_D)/coverage.html

.PHONY: download-tools
download-tools: $(GOLANGCI_LINT) $(REGCLIENT) $(ZOT)
download-tools: $(GOLANGCI_LINT) $(REGCLIENT) $(ZOT) $(BATS)

$(GOLANGCI_LINT):
@mkdir -p $(dir $@)
Expand Down Expand Up @@ -157,7 +157,7 @@ PRIVILEGE_LEVEL?=
check: lint test go-test

.PHONY: test
test: stacker $(REGCLIENT) $(SKOPEO) $(ZOT) $(BATS)
test: stacker download-tools
sudo -E PATH="$(PATH)" \
STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \
STACKER_BUILD_BUSYBOX_IMAGE=$(STACKER_BUILD_BUSYBOX_IMAGE) \
Expand All @@ -171,7 +171,7 @@ test: stacker $(REGCLIENT) $(SKOPEO) $(ZOT) $(BATS)
check-cov: lint test-cov

.PHONY: test-cov
test-cov: stacker-cov $(REGCLIENT) $(SKOPEO) $(ZOT) $(BATS)
test-cov: stacker-cov download-tools
sudo -E PATH="$(PATH)" \
-E GOCOVERDIR="$$GOCOVERDIR" \
STACKER_BUILD_ALPINE_IMAGE=$(STACKER_BUILD_ALPINE_IMAGE) \
Expand Down

0 comments on commit a31c9e3

Please sign in to comment.