Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test cc-rs 1.0.88 without 53564e00498156c9be00361c4b039952cbf7ff59 #121874

Closed
wants to merge 14 commits into from
Closed

Test cc-rs 1.0.88 without 53564e00498156c9be00361c4b039952cbf7ff59 #121874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c1da92
BUmp to cc 80
dpaoliello Mar 1, 2024
a556bb9
cc86
dpaoliello Mar 1, 2024
4ed1cdf
cc83
dpaoliello Mar 1, 2024
8cbdebf
fix lock
dpaoliello Mar 1, 2024
0cf6e0e
actually 80
dpaoliello Mar 1, 2024
38dd0b0
only build arm
dpaoliello Mar 1, 2024
ec5aaef
text android fix branch
dpaoliello Mar 1, 2024
9c6cda7
83 without libc
dpaoliello Mar 1, 2024
256f2c1
fix cc
dpaoliello Mar 2, 2024
9924f80
BUmp to 84
dpaoliello Mar 2, 2024
09747c7
53564e00498156c9be00361c4b039952cbf7ff59
dpaoliello Mar 2, 2024
66bd26c
755e4fe6fbf4b86679aa07d02e0228315321d534
dpaoliello Mar 4, 2024
60f9479
1.0.88 without 53564e00498156c9be00361c4b039952cbf7ff59
dpaoliello Mar 4, 2024
f994f55
Use proposed fix
dpaoliello Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,7 @@ 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
- name: arm-android
os: ubuntu-20.04-16core-64gb
env: {}
defaults:
Expand Down
5 changes: 2 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,8 @@ version = "0.1.0"

[[package]]
name = "cc"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
version = "1.0.89"
source = "git+https://github.com/dpaoliello/cc-rs?branch=fixarm#ec3050366f1eb572cd227248a1cf87de64dae7bd"

[[package]]
name = "cfg-if"
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ strip = true
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
cc = { git="https://github.com/dpaoliello/cc-rs", branch="fixarm" }

[patch."https://github.com/rust-lang/rust-clippy"]
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
2 changes: 1 addition & 1 deletion compiler/rustc_llvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 1 addition & 12 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,7 @@ 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
- name: arm-android
<<: *job-linux-16c

auto:
Expand Down
Loading