diff --git a/RELEASING.md b/RELEASING.md index b56a3db4d50..73d6c5eb4e5 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -9,7 +9,7 @@ If you don't work at Datawire, this document is probably not going to help you. If you're still reading, you must be at Datawire. Congrats, you picked a fine place to work! To release Ambassador, you'll need credentials for our Github repos. -Note. PRs will pile up on `master`. **Don't accept PRs for which CI doesn't show passing tests.** +Note. PRs will pile up on `master`. **Don't accept PRs for which CI doesn't show passing tests.** When we get to the stage of creating a release, all the PRs that we want to merge will have been merged and the CI will be green. @@ -19,7 +19,7 @@ and the CI will be green. 2. The RC tag will trigger CI to run a new build and new tests. It had better pass: if not, figure out why. Monitor https://travis-ci.com/datawire/amabassador/ until the CI for ambassador completes and is green. -3. The RC build will be available as e.g. `docker.io/datawire/ambassador:0.77.0-rc.1` and also as e.g. `docker.io/datawire/ambassador:0.77.0-rc-latest`. Any other testing you want to do against this image, rock on. +3. The RC build will be available as e.g. `docker.io/datawire/ambassador:0.77.0-rc.1`. Any other testing you want to do against this image, rock on. 4. When you're happy that the RC is ready for GA, **first** assemble the list of changes that you'll put into CHANGELOG.md: (Note: place this list in a separate file, maybe `~/temp-list.txt`, but definitely not in CHANGELOG.md at this time. - We always call out things contributed by the community, including who committed it @@ -82,4 +82,3 @@ and the CI will be green. - If you want to test before submitting, use `yarn install && yarn start` and point a web browser to `localhost:8000` Submit a PR to the Ambassador website repository to update the version on the homepage. Details can be found there on specifically how to do that. - diff --git a/builder/builder.mk b/builder/builder.mk index ba4b5090f44..ed7010e392e 100644 --- a/builder/builder.mk +++ b/builder/builder.mk @@ -708,7 +708,6 @@ shell: docker/container.txt .PHONY: shell AMB_IMAGE_RC=$(RELEASE_REGISTRY)/$(REPO):$(RELEASE_VERSION) -AMB_IMAGE_RC_LATEST=$(RELEASE_REGISTRY)/$(REPO):$(BUILD_VERSION)-rc-latest AMB_IMAGE_RELEASE=$(RELEASE_REGISTRY)/$(REPO):$(BUILD_VERSION) export RELEASE_REGISTRY_ERR=$(RED)ERROR: please set the RELEASE_REGISTRY make/env variable to the docker registry\n you would like to use for release$(END) @@ -804,18 +803,6 @@ release/print-test-artifacts: } .PHONY: release/print-test-artifacts -# To be run from a checkout at the tag you are promoting _from_. -# At present, this is to be run by-hand. -release/promote-oss/to-rc-latest: - @test -n "$(RELEASE_REGISTRY)" || (printf "$${RELEASE_REGISTRY_ERR}\n"; exit 1) - @[[ "$(RELEASE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$$ ]] || (printf '$(RED)ERROR: RELEASE_VERSION=%s does not look like an RC tag\n' "$(RELEASE_VERSION)"; exit 1) - @{ $(MAKE) release/promote-oss/.main \ - PROMOTE_FROM_VERSION="$(RELEASE_VERSION)" \ - PROMOTE_TO_VERSION="$$(echo "$(RELEASE_VERSION)" | sed 's/-rc.*/-rc-latest/')" \ - PROMOTE_CHANNEL=test \ - ; } -.PHONY: release/promote-oss/to-rc-latest - # just push the commit hash to s3 # this should only happen if all tests have passed at a certain commit release/promote-oss/dev-to-passed-ci: @@ -1113,8 +1100,6 @@ define _help.targets $(BLD)$(MAKE) $(BLU)shell$(END) -- starts a shell in the build container - $(BLD)$(MAKE) $(BLU)release/promote-oss/to-rc-latest$(END) -- promote a release candidate '-rc.N' release to '-rc-latest' - The current commit must be tagged for this to work, and your tree must be clean. Additionally, the tag must be of the form 'vX.Y.Z-rc.N'. You must also have previously built an RC for the same tag using $(BLD)release/bits$(END). @@ -1123,8 +1108,7 @@ define _help.targets The current commit must be tagged for this to work, and your tree must be clean. Additionally, the tag must be of the form 'vX.Y.Z'. You must also have previously - built and promoted the RC that will become GA, using $(BLD)release/bits$(END) and - $(BLD)release/promote-oss/to-rc-latest$(END). + built and promoted the RC that will become GA, using $(BLD)release/bits$(END). $(BLD)$(MAKE) $(BLU)clean$(END) -- kills the build container.