diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b9f87c079e3a..f0216b4601fd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,6 +152,15 @@ jobs: - name: dist-x86_64-linux os: ubuntu-latest-xl env: {} + - name: dist-various-1 + os: ubuntu-latest-xl + env: {} + - name: dist-i586-gnu-i586-i686-musl + os: ubuntu-latest-xl + env: {} + - name: dist-x86_64-musl + os: ubuntu-latest-xl + env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/Cargo.lock b/Cargo.lock index b54566e7176b0..7f5285b7047ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1808,8 +1808,7 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" version = "0.2.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" +source = "git+https://github.com/Amanieu/libc?branch=musl_libgcc2#09bdb4650962ad574403488776e1e200e949451d" dependencies = [ "rustc-std-workspace-core", ] diff --git a/Cargo.toml b/Cargo.toml index f10d539d8296b..7cb8a9ff7d66a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,5 +79,7 @@ rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' } rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' } rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' } +libc = { git = "https://github.com/Amanieu/libc", branch = "musl_libgcc2" } + [patch."https://github.com/rust-lang/rust-clippy"] clippy_lints = { path = "src/tools/clippy/clippy_lints" } diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 818306a009229..b0c762490dfcb 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -26,6 +26,9 @@ jobs: strategy: matrix: dist-x86_64-linux: {} + dist-various-1: {} + dist-i586-gnu-i586-i686-musl: {} + dist-x86_64-musl: {} # The macOS and Windows builds here are currently disabled due to them not being # overly necessary on `try` builds. We also don't actually have anything that diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 5e67567c76b4f..45381f1f20325 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -281,6 +281,15 @@ jobs: - name: dist-x86_64-linux <<: *job-linux-xl + - name: dist-various-1 + <<: *job-linux-xl + + - name: dist-i586-gnu-i586-i686-musl + <<: *job-linux-xl + + - name: dist-x86_64-musl + <<: *job-linux-xl + auto: <<: *base-ci-job name: auto diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index e3f92d4806152..bdc7e9f55a96d 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -4,7 +4,10 @@ use std::fs; use std::path::Path; /// List of whitelisted sources for packages. -const WHITELISTED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""]; +const WHITELISTED_SOURCES: &[&str] = &[ + "\"registry+https://github.com/rust-lang/crates.io-index\"", + "\"git+https://github.com/Amanieu/libc?branch=musl_libgcc2#09bdb4650962ad574403488776e1e200e949451d\"", +]; /// Checks for external package sources. pub fn check(path: &Path, bad: &mut bool) {