Skip to content

Commit 6ffe0f9

Browse files
Merge pull request #194 from caseydavenport/fix-release
Fix release
2 parents 65aba56 + 968c675 commit 6ffe0f9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,8 @@ ifneq ($(VERSION), $(GIT_VERSION))
433433
$(error Attempt to build $(VERSION) from $(GIT_VERSION))
434434
endif
435435
$(MAKE) image-all
436-
$(MAKE) tag-images-all IMAGETAG=$(VERSION)
437-
$(MAKE) tag-images-all IMAGETAG=latest
436+
$(MAKE) tag-images-all RELEASE=true IMAGETAG=$(VERSION)
437+
$(MAKE) tag-images-all RELEASE=true 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-all RELEASE=true IMAGETAG=$(VERSION)
460+
$(MAKE) push-all push-manifests push-non-manifests 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-all RELEASE=true IMAGETAG=latest
480+
$(MAKE) push-all push-manifests push-non-manifests 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)