Skip to content

Commit

Permalink
Merge pull request #3863 from elmiko/remove-extra-build-cmd
Browse files Browse the repository at this point in the history
remove extra build command from cluster-autoscaler
  • Loading branch information
k8s-ci-robot authored Mar 11, 2021
2 parents 9a17075 + ae92c92 commit bb3b24c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions cluster-autoscaler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,14 @@ export DOCKER_CLI_EXPERIMENTAL := enabled
build: build-arch-$(GOARCH)

build-arch-%: clean-arch-%
$(ENVVAR) GOOS=$(GOOS) GOARCH=$* go build ${LDFLAGS_FLAG} ${TAGS_FLAG} ./...
$(ENVVAR) GOOS=$(GOOS) GOARCH=$* go build -o cluster-autoscaler-$* ${LDFLAGS_FLAG} ${TAGS_FLAG}

build-binary: build-binary-arch-$(GOARCH)

build-binary-arch-%: clean-arch-%
$(ENVVAR) GOOS=$(GOOS) GOARCH=$* go build -o cluster-autoscaler-$* ${LDFLAGS_FLAG} ${TAGS_FLAG}

test-unit: clean build
go test --test.short -race ./... ${TAGS_FLAG}

dev-release: dev-release-arch-$(GOARCH)

dev-release-arch-%: build-binary-arch-% make-image-arch-% push-image-arch-%
dev-release-arch-%: build-arch-% make-image-arch-% push-image-arch-%
@echo "Release ${TAG}${FOR_PROVIDER}-$* completed"

make-image: make-image-arch-$(GOARCH)
Expand Down Expand Up @@ -97,7 +91,7 @@ build-in-docker: build-in-docker-arch-$(GOARCH)

build-in-docker-arch-%: clean-arch-% docker-builder
docker run ${RM_FLAG} -v `pwd`:/gopath/src/k8s.io/autoscaler/cluster-autoscaler/:Z autoscaling-builder:latest \
bash -c 'cd /gopath/src/k8s.io/autoscaler/cluster-autoscaler && BUILD_TAGS=${BUILD_TAGS} LDFLAGS="${LDFLAGS}" make build-binary-arch-$*'
bash -c 'cd /gopath/src/k8s.io/autoscaler/cluster-autoscaler && BUILD_TAGS=${BUILD_TAGS} LDFLAGS="${LDFLAGS}" make build-arch-$*'

release: $(addprefix build-in-docker-arch-,$(ALL_ARCH)) execute-release
@echo "Full in-docker release ${TAG}${FOR_PROVIDER} completed"
Expand Down

0 comments on commit bb3b24c

Please sign in to comment.