Skip to content

Commit 8d33192

Browse files
tomdeedeitch
authored andcommitted
Makefile: Update release to include all arches
(cherry picked from commit 9a505ea)
1 parent e3eb0e7 commit 8d33192

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ release-build: release-prereqs clean
432432
ifneq ($(VERSION), $(GIT_VERSION))
433433
$(error Attempt to build $(VERSION) from $(GIT_VERSION))
434434
endif
435-
$(MAKE) image
436-
$(MAKE) tag-images IMAGETAG=$(VERSION)
437-
$(MAKE) tag-images IMAGETAG=latest
435+
$(MAKE) image-all
436+
$(MAKE) tag-images-all IMAGETAG=$(VERSION)
437+
$(MAKE) tag-images-all IMAGETAG=latest
438438

439439
## Verifies the release artifacts produces by `make release-build` are correct.
440440
release-verify: release-prereqs
@@ -457,7 +457,7 @@ release-publish: release-prereqs
457457
git push origin $(VERSION)
458458

459459
# Push images.
460-
$(MAKE) push RELEASE=true IMAGETAG=$(VERSION) ARCH=$(ARCH)
460+
$(MAKE) push-all RELEASE=true IMAGETAG=$(VERSION)
461461

462462
@echo "Finalize the GitHub release based on the pushed tag."
463463
@echo "Attach the $(DIST)/calico-typha-amd64 binary."
@@ -477,7 +477,7 @@ release-publish-latest: release-prereqs
477477
if ! docker run $(BUILD_IMAGE):latest-$(ARCH) calico-typha --version | grep '$(VERSION)'; then echo "Reported version:" `docker run $(BUILD_IMAGE):latest-$(ARCH) calico-typha --version` "\nExpected version: $(VERSION)"; false; else echo "\nVersion check passed\n"; fi
478478
if ! docker run quay.io/$(BUILD_IMAGE):latest-$(ARCH) calico-typha --version | grep '$(VERSION)'; then echo "Reported version:" `docker run quay.io/$(BUILD_IMAGE):latest-$(ARCH) calico-typha --version` "\nExpected version: $(VERSION)"; false; else echo "\nVersion check passed\n"; fi
479479

480-
$(MAKE) push RELEASE=true IMAGETAG=latest ARCH=$(ARCH)
480+
$(MAKE) push-all RELEASE=true IMAGETAG=latest
481481

482482
# release-prereqs checks that the environment is configured properly to create a release.
483483
release-prereqs:

0 commit comments

Comments
 (0)