about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-06 09:05:46 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-06 22:22:35 +0530
commit88cef035b0437b38882a48d159cfc7d9a318c095 (patch)
tree15606f3247f19dc17018bb2782058bb546434b2c
parenta14d6a90527322d8800a80645b35c893d008dd09 (diff)
parent614853734e1e3553f9f10a5bd72bb31cbd0b1e13 (diff)
downloadrust-88cef035b0437b38882a48d159cfc7d9a318c095.tar.gz
rust-88cef035b0437b38882a48d159cfc7d9a318c095.zip
Rollup merge of #23094 - brson:beta, r=huonw
 No more alphas, please.
-rw-r--r--mk/main.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/main.mk b/mk/main.mk
index 9752ee233b6..c00494be47c 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.0
 # 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
 # versions (section 9)
-CFG_PRERELEASE_VERSION=.2
+CFG_PRERELEASE_VERSION=
 
 CFG_FILENAME_EXTRA=4e7c5e5c
 
@@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
-CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
-CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
+CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)