Skip to content

Commit 6fdb838

Browse files
committed
(DO NOT MERGE) Check that these tests do indeed work on Linux
1 parent e4b81f6 commit 6fdb838

File tree

3 files changed

+4
-74
lines changed

3 files changed

+4
-74
lines changed

.github/workflows/ci.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,8 @@ jobs:
4848
strategy:
4949
matrix:
5050
include:
51-
- name: mingw-check
52-
os: ubuntu-20.04-16core-64gb
53-
env: {}
54-
- name: mingw-check-tidy
55-
os: ubuntu-20.04-16core-64gb
56-
env: {}
57-
- name: x86_64-gnu-llvm-14
58-
os: ubuntu-20.04-16core-64gb
59-
env: {}
60-
- name: x86_64-gnu-tools
61-
os: ubuntu-20.04-16core-64gb
51+
- name: x86_64-gnu
52+
os: ubuntu-20.04-8core-32gb
6253
env: {}
6354
timeout-minutes: 600
6455
runs-on: "${{ matrix.os }}"

src/bootstrap/builder.rs

-52
Original file line numberDiff line numberDiff line change
@@ -684,60 +684,8 @@ impl<'a> Builder<'a> {
684684
crate::toolstate::ToolStateCheck,
685685
test::ExpandYamlAnchors,
686686
test::Tidy,
687-
test::Ui,
688-
test::RunPassValgrind,
689687
test::RunCoverage,
690-
test::MirOpt,
691-
test::Codegen,
692-
test::CodegenUnits,
693-
test::Assembly,
694-
test::Incremental,
695-
test::Debuginfo,
696-
test::UiFullDeps,
697-
test::Rustdoc,
698688
test::RunCoverageRustdoc,
699-
test::Pretty,
700-
test::Crate,
701-
test::CrateLibrustc,
702-
test::CrateRustdoc,
703-
test::CrateRustdocJsonTypes,
704-
test::CrateBootstrap,
705-
test::Linkcheck,
706-
test::TierCheck,
707-
test::Cargotest,
708-
test::Cargo,
709-
test::RustAnalyzer,
710-
test::ErrorIndex,
711-
test::Distcheck,
712-
test::RunMakeFullDeps,
713-
test::Nomicon,
714-
test::Reference,
715-
test::RustdocBook,
716-
test::RustByExample,
717-
test::TheBook,
718-
test::UnstableBook,
719-
test::RustcBook,
720-
test::LintDocs,
721-
test::RustcGuide,
722-
test::EmbeddedBook,
723-
test::EditionGuide,
724-
test::Rustfmt,
725-
test::Miri,
726-
test::Clippy,
727-
test::RustDemangler,
728-
test::CompiletestTest,
729-
test::RustdocJSStd,
730-
test::RustdocJSNotStd,
731-
test::RustdocGUI,
732-
test::RustdocTheme,
733-
test::RustdocUi,
734-
test::RustdocJson,
735-
test::HtmlCheck,
736-
test::RustInstaller,
737-
// Run bootstrap close to the end as it's unlikely to fail
738-
test::Bootstrap,
739-
// Run run-make last, since these won't pass without make on Windows
740-
test::RunMake,
741689
),
742690
Kind::Bench => describe!(test::Crate, test::CrateLibrustc),
743691
Kind::Doc => describe!(

src/ci/github-actions/ci.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,8 @@ jobs:
316316
strategy:
317317
matrix:
318318
include:
319-
- name: mingw-check
320-
<<: *job-linux-16c
321-
322-
- name: mingw-check-tidy
323-
<<: *job-linux-16c
324-
325-
- name: x86_64-gnu-llvm-14
326-
<<: *job-linux-16c
327-
328-
- name: x86_64-gnu-tools
329-
<<: *job-linux-16c
319+
- name: x86_64-gnu
320+
<<: *job-linux-8c
330321

331322
auto:
332323
<<: *base-ci-job

0 commit comments

Comments
 (0)