From e6efd40882358f9b27843a2fcc86dd23ec98c313 Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Tue, 26 Mar 2019 17:46:43 -0700 Subject: [PATCH] Update do-release to fully build images Forgot that the version is passed into the go binaries so we do need to rebuild each image from scratch, as it will show up in the logs. --- build/includes/release.mk | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/build/includes/release.mk b/build/includes/release.mk index a4ea07782b..a448a2dfbc 100644 --- a/build/includes/release.mk +++ b/build/includes/release.mk @@ -45,28 +45,23 @@ gen-changelog: do-release: RELEASE_VERSION ?= $(base_version) do-release: @echo "Starting release for version: $(RELEASE_VERSION)" + + # switch to the right project + $(DOCKER_RUN) gcloud config configurations activate agones-images + git checkout -b release-$(RELEASE_VERSION) - $(MAKE) lint test FULL_BUILD=1 -rm -rf $(agones_path)/release mkdir $(agones_path)/release - docker run --rm $(common_mounts) -w $(mount_path)/sdks/cpp $(build_tag) make clean - $(MAKE) build-sdks build-agones-sdk-binary VERSION=$(RELEASE_VERSION) REGISTRY=$(release_registry) FULL_BUILD=1 + + $(MAKE) -j 4 build VERSION=$(RELEASE_VERSION) REGISTRY=$(release_registry) FULL_BUILD=1 cp $(agones_path)/cmd/sdk-server/bin/agonessdk-server-$(RELEASE_VERSION).zip $(agones_path)/release - cp $(agones_path)/sdks/cpp/bin/agonessdk-$(RELEASE_VERSION)-runtime-linux-arch_64.tar.gz $(agones_path)/release - cp $(agones_path)/sdks/cpp/bin/agonessdk-$(RELEASE_VERSION)-dev-linux-arch_64.tar.gz $(agones_path)/release - cp $(agones_path)/sdks/cpp/bin/agonessdk-$(RELEASE_VERSION)-src.zip $(agones_path)/release + cp $(agones_path)/sdks/cpp/.build/agonessdk-$(RELEASE_VERSION)-linux-arch_64.tar.gz $(agones_path)/release cd $(agones_path) && zip -r ./release/agones-install-$(RELEASE_VERSION).zip ./README.md ./install ./LICENSE - # retag the current master commit images with the release tag. - $(MAKE) do-relase-tag-images RELEASE_VERSION=$(RELEASE_VERSION) + $(MAKE) gcloud-auth-docker + $(MAKE) -j 3 push REGISTRY=$(release_registry) VERSION=$(RELEASE_VERSION) $(MAKE) push-chart VERSION=$(RELEASE_VERSION) git push -u upstream release-$(RELEASE_VERSION) @echo "Now go make the $(RELEASE_VERSION) release on Github!" - -do-relase-tag-images: RELEASE_VERSION ?= $(base_version) -do-relase-tag-images: - docker run --rm $(common_mounts) $(build_tag) gcloud container images add-tag $(release_registry)/agones-controller:$(VERSION) $(release_registry)/agones-controller:$(RELEASE_VERSION) --quiet - docker run --rm $(common_mounts) $(build_tag) gcloud container images add-tag $(release_registry)/agones-sdk:$(VERSION) $(release_registry)/agones-sdk:$(RELEASE_VERSION) --quiet - docker run --rm $(common_mounts) $(build_tag) gcloud container images add-tag $(release_registry)/agones-ping:$(VERSION) $(release_registry)/agones-ping:$(RELEASE_VERSION) --quiet