From 8175e648109e308bfe42f7304e27783a6cf71b9d Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 25 Jan 2021 09:50:29 -0800 Subject: [PATCH 1/3] Set DEB_REVISION=2, since we manually had to upload new .deb files due to #10224 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 09c8bd0dd4..4d137b5836 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f ISO_VERSION ?= v1.17.0 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) -DEB_REVISION ?= 0 +DEB_REVISION ?= 2 RPM_VERSION ?= $(DEB_VERSION) RPM_REVISION ?= 0 From 647aa96458c273763388e716a3173782a54ee968 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 25 Jan 2021 09:52:24 -0800 Subject: [PATCH 2/3] Add updating revision info to docs --- site/content/en/docs/contrib/releasing/binaries.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/content/en/docs/contrib/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md index 4b3fa0a4a4..c1c22057c3 100644 --- a/site/content/en/docs/contrib/releasing/binaries.md +++ b/site/content/en/docs/contrib/releasing/binaries.md @@ -55,6 +55,9 @@ Update the version numbers in `Makefile`: - beta releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)` - major/minor releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).0` - if the ISO was updated, a patch release may use `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)` +* `DEB_REVISION`, `RPM_REVISION` + - for all major/minor releases, set to 0 + - if updating .deb files without a major/minor release, increment by 1 {{% alert title="Warning" color="warning" %}} Merge this PR only if all non-experimental integration tests pass! From 9f1c3b5f7f6fbe1ca761f6370ee730e0ae7008ad Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 25 Jan 2021 10:16:20 -0800 Subject: [PATCH 3/3] update docZ --- site/content/en/docs/contrib/releasing/binaries.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/contrib/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md index c1c22057c3..83ab003011 100644 --- a/site/content/en/docs/contrib/releasing/binaries.md +++ b/site/content/en/docs/contrib/releasing/binaries.md @@ -57,7 +57,7 @@ Update the version numbers in `Makefile`: - if the ISO was updated, a patch release may use `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)` * `DEB_REVISION`, `RPM_REVISION` - for all major/minor releases, set to 0 - - if updating .deb files without a major/minor release, increment by 1 + - if updating .deb/.rpm files without a major/minor release, increment by 1 {{% alert title="Warning" color="warning" %}} Merge this PR only if all non-experimental integration tests pass!