Skip to content

Commit 2a62242

Browse files
committed
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
2 parents 6b29a7d + 193461c commit 2a62242

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

mk/main.mk

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
3030
CFG_DISABLE_UNSTABLE_FEATURES=1
3131
endif
3232
ifeq ($(CFG_RELEASE_CHANNEL),beta)
33-
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
34-
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta$(CFG_PRERELEASE_VERSION)
33+
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta
34+
# When building beta distributables just reuse the same "beta" name
35+
# so when we upload we'll always override the previous beta. This
36+
# doesn't actually impact the version reported by rustc - it's just
37+
# for file naming.
38+
CFG_PACKAGE_VERS=beta
3539
CFG_DISABLE_UNSTABLE_FEATURES=1
3640
endif
3741
ifeq ($(CFG_RELEASE_CHANNEL),nightly)

0 commit comments

Comments
 (0)