Skip to content

Commit

Permalink
Avoid some duplication in CI run
Browse files Browse the repository at this point in the history
The CI workflow runs both `make test` and `make docker-build`, and the
latter target already has `test` as a prerequisite. I'd rather be
explicit about what's run in workflows, so: remove `test` as a
prerequisite of `docker-build`. (It's not a prerequisite of `build`,
for the record.)

While I'm here, let's make the default target something useful: now it
runs `lint`, `test`, and `build`.

Signed-off-by: Michael Bridgen <[email protected]>
  • Loading branch information
squaremo committed Nov 6, 2023
1 parent 0d01a61 commit 9b230d3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

.PHONY: all
all: build
all: lint test build

##@ General

Expand Down Expand Up @@ -116,7 +116,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
go run ./main.go --log-level debug

.PHONY: docker-build
docker-build: test ## Build docker image with the manager.
docker-build: ## Build docker image with the manager.
docker buildx build --secret id=netrc,src=.netrc -t ${IMG} $(DOCKER_BUILD_ARGS) $(DOCKER_BUILD_LABELS) .

.PHONY: docker-push
Expand Down Expand Up @@ -235,4 +235,4 @@ e2e-clean:
flux uninstall --silent
ifneq ($(CI), true)
kind delete cluster --name=pipeline-controller
endif
endif

0 comments on commit 9b230d3

Please sign in to comment.