mirror of https://github.com/rust-lang/rust.git
Rollup merge of #22292 - brson:alpha2, r=alexcrichton
This commit is contained in:
commit
ed728ec145
|
@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.0
|
||||||
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
|
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
|
||||||
# NB Make sure it starts with a dot to conform to semver pre-release
|
# NB Make sure it starts with a dot to conform to semver pre-release
|
||||||
# versions (section 9)
|
# versions (section 9)
|
||||||
CFG_PRERELEASE_VERSION=.1
|
CFG_PRERELEASE_VERSION=.2
|
||||||
|
|
||||||
CFG_FILENAME_EXTRA=4e7c5e5c
|
CFG_FILENAME_EXTRA=4e7c5e5c
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
|
||||||
CFG_DISABLE_UNSTABLE_FEATURES=1
|
CFG_DISABLE_UNSTABLE_FEATURES=1
|
||||||
endif
|
endif
|
||||||
ifeq ($(CFG_RELEASE_CHANNEL),beta)
|
ifeq ($(CFG_RELEASE_CHANNEL),beta)
|
||||||
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
|
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
|
||||||
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
|
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
|
||||||
CFG_DISABLE_UNSTABLE_FEATURES=1
|
CFG_DISABLE_UNSTABLE_FEATURES=1
|
||||||
endif
|
endif
|
||||||
ifeq ($(CFG_RELEASE_CHANNEL),nightly)
|
ifeq ($(CFG_RELEASE_CHANNEL),nightly)
|
||||||
|
|
Loading…
Reference in New Issue