diff options
| author | bors <bors@rust-lang.org> | 2024-06-30 13:22:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-30 13:22:17 +0000 |
| commit | 6c3485512fc95fa9c43cb831607bfec9d2153b6e (patch) | |
| tree | b1a09e107f7774ac15fe87e15ef57746aeb2cc6d /src | |
| parent | 2975a21b5d6e4718cf219349d3cb37d45c20f84d (diff) | |
| parent | f2c287f744301f9833b5acd02d7951bb93ac3cba (diff) | |
| download | rust-6c3485512fc95fa9c43cb831607bfec9d2153b6e.tar.gz rust-6c3485512fc95fa9c43cb831607bfec9d2153b6e.zip | |
Auto merge of #127156 - matthiaskrgr:rollup-jjfd464, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #126705 (Updated docs on `#[panic_handler]` in `library/core/src/lib.rs`) - #126876 (Add `.ignore` file to make `config.toml` searchable in vscode) - #126906 (Small fixme in core now that split_first has no codegen issues) - #127023 (CI: rename Rust for Linux CI job) - #127131 (Remove unused `rustc_trait_selection` dependencies) - #127134 (Print `TypeId` as a `u128` for `Debug`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile (renamed from src/ci/docker/host-x86_64/rfl/Dockerfile) | 0 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/rfl/Dockerfile b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile index 97298519cf2..97298519cf2 100644 --- a/src/ci/docker/host-x86_64/rfl/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index cf750bbd0c5..a6e12c6ff95 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -215,6 +215,11 @@ auto: only_on_channel: nightly <<: *job-linux-8c + # Tests integration with Rust for Linux. + # Builds stage 1 compiler and tries to compile a few RfL examples with it. + - image: x86_64-rust-for-linux + <<: *job-linux-8c + - image: x86_64-gnu <<: *job-linux-4c @@ -465,8 +470,3 @@ auto: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths <<: *job-windows-8c - - # Tests integration with Rust for Linux. - # Builds stage 1 compiler and tries to compile a few RfL examples with it. - - image: rfl - <<: *job-linux-8c |