Skip to content

Commit

Permalink
fix: resolves #90
Browse files Browse the repository at this point in the history
* Installs cross from source
* Adds req deps to cross.toml and cargo.toml
  • Loading branch information
dutterbutter committed Sep 5, 2023
1 parent fbff511 commit 5c3d504
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,13 @@ jobs:
# ==============================
# Builds
# ==============================

- name: Install cross from source
run: |
cargo install --git https://github.com/cross-rs/cross cross --branch main
- name: Build era-test-node for ${{ matrix.arch }}
run: |
cargo install cross
make build-${{ matrix.arch }}
- name: Rename and move binary
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a
zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a98e454221da7d6ecad9b317cf44b0786e819659" }
zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a98e454221da7d6ecad9b317cf44b0786e819659" }
zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a98e454221da7d6ecad9b317cf44b0786e819659" }
openssl-sys = { version = "0.9", features = ["vendored"] }

anyhow = "1.0"
tokio = { version = "1", features = ["time", "rt"] }
Expand Down
13 changes: 10 additions & 3 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Cross.toml

[build]
[target.x86_64-unknown-linux-gnu]
pre-build = [
"apt-get update && apt-get install --assume-yes apt-utils --no-install-recommends pkg-config libssl-dev libsasl2-dev llvm-dev libclang-6.0-dev clang-6.0"
]
"export DEBIAN_FRONTEND=noninteractive",
"export TZ=Etc/UTC",
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt update -q",
"apt upgrade -yq",
"add-apt-repository -y ppa:savoury1/virtualisation",
"apt-get upgrade -yq",
"apt update -q && apt install --assume-yes --no-install-recommends libclang-10-dev clang-10 cmake build-essential pkg-config libssl-dev:$CROSS_DEB_ARCH libsasl2-dev llvm-dev curl gnutls-bin"
]

0 comments on commit 5c3d504

Please sign in to comment.