Merge pull request #10257 from priyawadhwa/deb-revision

Set DEB_REVISION=2 and update release docs for deb/rpm revisions
pull/10193/head^2
priyawadhwa 2021-01-25 10:42:33 -08:00 committed by GitHub
commit 9f6b66ccb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -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/.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!