diff options
| author | bors <bors@rust-lang.org> | 2015-04-23 04:50:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-23 04:50:39 +0000 |
| commit | 2a6224252c0481f2ab7aa5bd30e134f9b31bb0a2 (patch) | |
| tree | 945d0cdf141c87e09db664970bf494aa6f079826 | |
| parent | 6b29a7d5641e5242e1f3459b290e2c7f8e49e85a (diff) | |
| parent | 193461c63aa15d476c48a632f35a2284b27bc843 (diff) | |
| download | rust-2a6224252c0481f2ab7aa5bd30e134f9b31bb0a2.tar.gz rust-2a6224252c0481f2ab7aa5bd30e134f9b31bb0a2.zip | |
Auto merge of #24693 - brson:beta, r=alexcrichton
Instead of rustc-1.0.0-beta-$triple.tar.gz, betas will be named rustc-beta-$triple.tar.gz. This will give betas a stable download URL, prevent old artifacts from accumulating in the dist server's root directory, and not require the website to be updated every beta. As a tradeoff, it will be harder to download previous betas because they will need to be located in the archives. I'm still unsure about whether this is the right choice. cc @alexcrichton @steveklabnik
| -rw-r--r-- | mk/main.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/main.mk b/mk/main.mk index d25f9832142..c1ce1051d0a 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -30,8 +30,12 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM) CFG_DISABLE_UNSTABLE_FEATURES=1 endif ifeq ($(CFG_RELEASE_CHANNEL),beta) -CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION) -CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION) +CFG_RELEASE=$(CFG_RELEASE_NUM)-beta +# When building beta distributables just reuse the same "beta" name +# so when we upload we'll always override the previous beta. This +# doesn't actually impact the version reported by rustc - it's just +# for file naming. +CFG_PACKAGE_VERS=beta CFG_DISABLE_UNSTABLE_FEATURES=1 endif ifeq ($(CFG_RELEASE_CHANNEL),nightly) |