diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b0a33841ad99..7f11cb67c5db4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,18 +52,8 @@ jobs: strategy: matrix: include: - - name: mingw-check - os: ubuntu-20.04-4core-16gb - env: {} - - name: mingw-check-tidy - os: ubuntu-20.04-4core-16gb - env: {} - - name: x86_64-gnu-llvm-16 - env: - ENABLE_GCC_CODEGEN: "1" - os: ubuntu-20.04-16core-64gb - - name: x86_64-gnu-tools - os: ubuntu-20.04-16core-64gb + - name: arm-android + os: ubuntu-20.04-8core-32gb env: {} defaults: run: diff --git a/Cargo.lock b/Cargo.lock index 47977a8850d6a..2b0a1372ac500 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,12 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 6598f1db86dac..c5c986fd9409b 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -15,5 +15,5 @@ libc = "0.2.73" # 1.0.{84, 85} fix this but have been yanked [build-dependencies] # tidy-alphabetical-start -cc = "=1.0.79" +cc = "=1.0.83" # tidy-alphabetical-end diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 58d5dec9ba520..add42155d25a5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -351,19 +351,8 @@ jobs: strategy: matrix: include: - - name: mingw-check - <<: *job-linux-4c - - - name: mingw-check-tidy - <<: *job-linux-4c - - - name: x86_64-gnu-llvm-16 - env: - ENABLE_GCC_CODEGEN: "1" - <<: *job-linux-16c - - - name: x86_64-gnu-tools - <<: *job-linux-16c + - name: arm-android + <<: *job-linux-8c auto: <<: *base-ci-job