Skip to content

Commit

Permalink
Merge pull request #194 from caseydavenport/fix-release
Browse files Browse the repository at this point in the history
Fix release
  • Loading branch information
caseydavenport authored Sep 24, 2018
2 parents 65aba56 + 968c675 commit 6ffe0f9
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 @@ -433,8 +433,8 @@ ifneq ($(VERSION), $(GIT_VERSION))
$(error Attempt to build $(VERSION) from $(GIT_VERSION))
endif
$(MAKE) image-all
$(MAKE) tag-images-all IMAGETAG=$(VERSION)
$(MAKE) tag-images-all IMAGETAG=latest
$(MAKE) tag-images-all RELEASE=true IMAGETAG=$(VERSION)
$(MAKE) tag-images-all RELEASE=true IMAGETAG=latest

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

# Push images.
$(MAKE) push-all RELEASE=true IMAGETAG=$(VERSION)
$(MAKE) push-all push-manifests push-non-manifests RELEASE=true IMAGETAG=$(VERSION)

@echo "Finalize the GitHub release based on the pushed tag."
@echo "Attach the $(DIST)/calico-typha-amd64 binary."
Expand All @@ -477,7 +477,7 @@ release-publish-latest: release-prereqs
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
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

$(MAKE) push-all RELEASE=true IMAGETAG=latest
$(MAKE) push-all push-manifests push-non-manifests RELEASE=true IMAGETAG=latest

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

0 comments on commit 6ffe0f9

Please sign in to comment.