Merge pull request #10257 from priyawadhwa/deb-revision
Set DEB_REVISION=2 and update release docs for deb/rpm revisionspull/10193/head^2
commit
9f6b66ccb0
2
Makefile
2
Makefile
|
@ -26,7 +26,7 @@ KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f
|
||||||
ISO_VERSION ?= v1.17.0
|
ISO_VERSION ?= v1.17.0
|
||||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||||
DEB_REVISION ?= 0
|
DEB_REVISION ?= 2
|
||||||
|
|
||||||
RPM_VERSION ?= $(DEB_VERSION)
|
RPM_VERSION ?= $(DEB_VERSION)
|
||||||
RPM_REVISION ?= 0
|
RPM_REVISION ?= 0
|
||||||
|
|
|
@ -55,6 +55,9 @@ Update the version numbers in `Makefile`:
|
||||||
- beta releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)`
|
- beta releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)`
|
||||||
- major/minor releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).0`
|
- 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)`
|
- 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" %}}
|
{{% alert title="Warning" color="warning" %}}
|
||||||
Merge this PR only if all non-experimental integration tests pass!
|
Merge this PR only if all non-experimental integration tests pass!
|
||||||
|
|
Loading…
Reference in New Issue