Skip to content

Commit ab37956

Browse files
committed
Auto merge of rust-lang#117349 - Skgland:easy-beta-channels-test, r=<try>
[Experiment] for rust-lang#117191 Based on the request in rust-lang#117191 (comment)
2 parents 489647f + 43f592f commit ab37956

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ jobs:
530530
try:
531531
name: "try - ${{ matrix.name }}"
532532
env:
533-
DIST_TRY_BUILD: 1
534533
CI_JOB_NAME: "${{ matrix.name }}"
535534
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
536535
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"

src/ci/github-actions/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,6 @@ jobs:
700700
<<: *base-ci-job
701701
name: try - ${{ matrix.name }}
702702
env:
703-
DIST_TRY_BUILD: 1
704703
<<: [*shared-ci-variables, *prod-variables]
705704
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
706705
strategy:

src/tools/build-manifest/src/main.rs

+23
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,29 @@ impl Builder {
264264
// channel-rust-1.XX.toml
265265
let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
266266
self.write_channel_files(&major_minor, &manifest);
267+
} else if channel == "beta" {
268+
// channel-rust-1.XX.YY-beta.Z.toml
269+
let rust_version = self
270+
.versions
271+
.version(&PkgType::Rust)
272+
.expect("missing Rust tarball")
273+
.version
274+
.expect("missing Rust version")
275+
.split(' ')
276+
.next()
277+
.unwrap()
278+
.to_string();
279+
self.write_channel_files(&rust_version, &manifest);
280+
281+
// channel-rust-1.XX.YY-beta.toml
282+
let major_minor_patch_beta =
283+
rust_version.split('.').take(3).collect::<Vec<_>>().join(".");
284+
self.write_channel_files(&major_minor_patch_beta, &manifest);
285+
286+
// channel-rust-1.XX-beta.toml
287+
let major_minor_beta =
288+
format!("{}-beta", rust_version.split('.').take(2).collect::<Vec<_>>().join("."));
289+
self.write_channel_files(&major_minor_beta, &manifest);
267290
}
268291

269292
if let Some(path) = std::env::var_os("BUILD_MANIFEST_SHIPPED_FILES_PATH") {

0 commit comments

Comments
 (0)