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

Jump to bottom

Update dependencies to support Apple M1, fix Windows CI LLVM paths #2026

Merged
merged 4 commits into from
Apr 19, 2021
Merged

Update dependencies to support Apple M1, fix Windows CI LLVM paths #2026

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
935f73b
build(deps): update for Apple M1
fanatid Apr 17, 2021
53641e6
fix ci
fanatid Apr 17, 2021
9b19562
bump rocksdb
fanatid Apr 18, 2021
ebb3e30
bump zcash_script
fanatid Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ jobs:
command: fetch
- name: Install LLVM on Windows
if: matrix.os == 'windows-latest'
run: choco install llvm -y
run: |
choco install llvm -y
echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: Skip network tests on Ubuntu
# Ubuntu runners don't have network or DNS configured during test steps
if: matrix.os == 'ubuntu-latest'
Expand Down Expand Up @@ -126,7 +129,10 @@ jobs:
override: true
- name: Install LLVM on Windows
if: matrix.os == 'windows-latest'
run: choco install llvm -y
run: |
choco install llvm -y
echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
Expand Down
144 changes: 64 additions & 80 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,5 @@ metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128
metrics-exporter-prometheus = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }
tower = { git = "https://github.com/tower-rs/tower", rev = "d4d1c67c6a0e4213a52abcc2b9df6cc58276ee39" }

# lexical-core 0.7.4 is incompatible with rustc nightly >= ~2021-03-24
# https://github.com/rust-lang/rust/issues/81654
# remove when zcash_script and rocksdb transitively depend on lexical-core >= 0.7.5
lexical-core = { git = "https://github.com/Alexhuszagh/rust-lexical", rev = "601c9bfe16c944948d4c4a07e3c67878d72f6445" }
# Apple M1
zcash_script = { git = "https://github.com/fanatid/zcash_script/", rev = "48320355781547c7689230c38012d9860d7371ea" }
fanatid marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion zebra-script/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
zcash_script = "0.1.5"
zcash_script = "0.1.6-alpha.0"
fanatid marked this conversation as resolved.
Show resolved Hide resolved
zebra-chain = { path = "../zebra-chain" }
thiserror = "1.0.24"
displaydoc = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion zebra-state/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tracing = "0.1"
thiserror = "1.0.24"
tokio = { version = "0.3.6", features = ["sync"] }
displaydoc = "0.2.1"
rocksdb = "0.15.0"
rocksdb = "0.16.0"
fanatid marked this conversation as resolved.
Show resolved Hide resolved
tempdir = "0.3.7"
chrono = "0.4.19"
primitive-types = "0.9.0"
Expand Down