Skip to content

Tweaks to beta/alpha versioning #20323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 31, 2014
Merged

Tweaks to beta/alpha versioning #20323

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56c26ab
mk: Allow an optional number to come after the beta version label
brson Dec 30, 2014
f253002
mk: The beta channel temporarily produced alpha versions
brson Dec 30, 2014
20fcece
mk: The alpha will not have a cycle number
brson Dec 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions mk/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
# The version number
CFG_RELEASE_NUM=0.13.0

# An optional number to put after the label, e.g. '2' -> '-beta2'
CFG_BETA_CYCLE=

CFG_FILENAME_EXTRA=4e7c5e5c

ifeq ($(CFG_RELEASE_CHANNEL),stable)
Expand All @@ -24,12 +27,13 @@ CFG_RELEASE=$(CFG_RELEASE_NUM)
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
endif
ifeq ($(CFG_RELEASE_CHANNEL),beta)
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta
# The beta channel is temporarily called 'alpha'
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
# When building beta/nightly distributables just reuse the same "beta"
# name so when we upload we'll always override the previous
# nighly. This doesn't actually impact the version reported by rustc -
# it's just for file naming.
CFG_PACKAGE_VERS=beta
CFG_PACKAGE_VERS=alpha
endif
ifeq ($(CFG_RELEASE_CHANNEL),nightly)
CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly
Expand Down