From 6c1da921b1f2a6e48ab554b849d48a32bf87f425 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:55:54 -0800 Subject: [PATCH 1/5] BUmp to cc 80 --- .github/workflows/ci.yml | 7 +++---- Cargo.lock | 4 ++-- compiler/rustc_llvm/Cargo.toml | 2 +- src/ci/github-actions/ci.yml | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b0a33841ad99..6382cac1f2015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,10 +58,9 @@ jobs: - 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: arm-android + os: ubuntu-20.04-8core-32gb + env: {} - name: x86_64-gnu-tools os: ubuntu-20.04-16core-64gb env: {} diff --git a/Cargo.lock b/Cargo.lock index 47977a8850d6a..ecb1167b12b36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,9 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" [[package]] name = "cfg-if" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 6598f1db86dac..f5fcda6be1341 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.80" # tidy-alphabetical-end diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 58d5dec9ba520..9fb42c9bc73fb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -357,10 +357,8 @@ jobs: - name: mingw-check-tidy <<: *job-linux-4c - - name: x86_64-gnu-llvm-16 - env: - ENABLE_GCC_CODEGEN: "1" - <<: *job-linux-16c + - name: arm-android + <<: *job-linux-8c - name: x86_64-gnu-tools <<: *job-linux-16c From a556bb92ee8c116d97f60b8288397c2460e343d6 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:58:22 -0800 Subject: [PATCH 2/5] cc86 --- compiler/rustc_llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index f5fcda6be1341..4b8cc681d0d70 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.80" +cc = "1.0.86" # tidy-alphabetical-end From 4ed1cdfeec51b90144ab7f2cdf3e7519382c0117 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 13:59:31 -0800 Subject: [PATCH 3/5] cc83 --- compiler/rustc_llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index 4b8cc681d0d70..facde3b4f9145 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.86" +cc = "1.0.83" # tidy-alphabetical-end From 8cbdebfda28b1e4b65e3174ab220bdbbfdcf4ebc Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:03:10 -0800 Subject: [PATCH 4/5] fix lock --- Cargo.lock | 7 +++++-- compiler/rustc_llvm/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ecb1167b12b36..2b0a1372ac500 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,9 +447,12 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.0.88" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index facde3b4f9145..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.83" +cc = "=1.0.83" # tidy-alphabetical-end From e3c22cb47d2dbd5838f2b45b11705ae5e6b17c32 Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Fri, 1 Mar 2024 14:09:41 -0800 Subject: [PATCH 5/5] only build arm --- .github/workflows/ci.yml | 9 --------- src/ci/github-actions/ci.yml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6382cac1f2015..7f11cb67c5db4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,18 +52,9 @@ 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: arm-android os: ubuntu-20.04-8core-32gb env: {} - - name: x86_64-gnu-tools - os: ubuntu-20.04-16core-64gb - env: {} defaults: run: shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 9fb42c9bc73fb..add42155d25a5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -351,18 +351,9 @@ jobs: strategy: matrix: include: - - name: mingw-check - <<: *job-linux-4c - - - name: mingw-check-tidy - <<: *job-linux-4c - - name: arm-android <<: *job-linux-8c - - name: x86_64-gnu-tools - <<: *job-linux-16c - auto: <<: *base-ci-job name: auto - ${{ matrix.name }}