Skip to content

[Experiment] for #117191 #117349

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

Closed
wants to merge 2 commits into from
Closed

[Experiment] for #117191 #117349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183379c
generate beta manifests as pre-requisit rust-lang/rustup#1329
Skgland Oct 25, 2023
43f592f
Regular try builds
Mark-Simulacrum Nov 4, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ jobs:
try:
name: "try - ${{ matrix.name }}"
env:
DIST_TRY_BUILD: 1
CI_JOB_NAME: "${{ matrix.name }}"
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
Expand Down
1 change: 0 additions & 1 deletion src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ jobs:
<<: *base-ci-job
name: try - ${{ matrix.name }}
env:
DIST_TRY_BUILD: 1
<<: [*shared-ci-variables, *prod-variables]
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
strategy:
Expand Down
23 changes: 23 additions & 0 deletions src/tools/build-manifest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,29 @@ impl Builder {
// channel-rust-1.XX.toml
let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
self.write_channel_files(&major_minor, &manifest);
} else if channel == "beta" {
// channel-rust-1.XX.YY-beta.Z.toml
let rust_version = self
.versions
.version(&PkgType::Rust)
.expect("missing Rust tarball")
.version
.expect("missing Rust version")
.split(' ')
.next()
.unwrap()
.to_string();
self.write_channel_files(&rust_version, &manifest);

// channel-rust-1.XX.YY-beta.toml
let major_minor_patch_beta =
rust_version.split('.').take(3).collect::<Vec<_>>().join(".");
self.write_channel_files(&major_minor_patch_beta, &manifest);

// channel-rust-1.XX-beta.toml
let major_minor_beta =
format!("{}-beta", rust_version.split('.').take(2).collect::<Vec<_>>().join("."));
self.write_channel_files(&major_minor_beta, &manifest);
}

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