Skip to content

Commit

Permalink
Move arch info to System
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas committed Nov 5, 2023
1 parent 56e3e5e commit 78ee171
Show file tree
Hide file tree
Showing 21 changed files with 356 additions and 508 deletions.
8 changes: 4 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
task:
name: rust 1.65 on freebsd 13
name: rust 1.69 on freebsd 13
freebsd_instance:
image: freebsd-13-1-release-amd64
setup_script:
- curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh -y --profile=minimal --default-toolchain=1.65
- sh rustup.sh -y --profile=minimal --default-toolchain=1.69
- . $HOME/.cargo/env
- rustup --version
- rustup component add clippy
Expand Down Expand Up @@ -37,14 +37,14 @@ task:
- FREEBSD_CI=1 cargo test --lib -j1 -- --ignored

task:
name: rust 1.65 on mac m1
name: rust 1.69 on mac m1
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
setup_script:
- brew update
- brew install curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh -y --profile=minimal --default-toolchain=1.65
- sh rustup.sh -y --profile=minimal --default-toolchain=1.69
- source $HOME/.cargo/env
- rustup --version
- rustup component add clippy
Expand Down
144 changes: 74 additions & 70 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ rustdoc-args = ["--generate-link-to-definition"]

[dependencies]
cfg-if = "1.0"
rayon = { version = "^1.5.1", optional = true }
serde = { version = "^1.0.152", optional = true }
rayon = { version = "^1.8", optional = true }
serde = { version = "^1.0.190", optional = true }

[target.'cfg(any(windows, target_os = "linux", target_os = "android"))'.dependencies]
once_cell = "1.0"
once_cell = "1.18"

[target.'cfg(windows)'.dependencies]
ntapi = "0.4"
Expand Down Expand Up @@ -85,13 +85,13 @@ windows = { version = "0.51", features = [
] }

[target.'cfg(not(any(target_os = "unknown", target_arch = "wasm32")))'.dependencies]
libc = "^0.2.144"
libc = "^0.2.150"

[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
core-foundation-sys = "0.8"

[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dev-dependencies]
tempfile = "3.2"
tempfile = "3.8"

[dev-dependencies]
serde_json = "1.0" # Used in documentation tests.
Loading

0 comments on commit 78ee171

Please sign in to comment.