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

fix(build): switch linux-arm64 builds to cross-rs #4524

Merged
merged 2 commits into from
Aug 23, 2022
Merged

fix(build): switch linux-arm64 builds to cross-rs #4524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
846c8c2
Switch linux-arm64 build to cross for GHA binaries build
leet4tari Aug 23, 2022
f41fdd5
Remove older arm64 hack for cross-rs compile
leet4tari Aug 23, 2022
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
3 changes: 2 additions & 1 deletion .github/workflows/base_node_binaries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"runs-on": "ubuntu-latest",
"rust": "stable",
"target": "aarch64-unknown-linux-gnu",
"cross": false,
"cross": true,
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_cpu": "generic",
"features": "safe"
},
Expand Down
27 changes: 3 additions & 24 deletions .github/workflows/base_node_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
override: true

- name: Install Linux dependencies - Ubuntu
if: startsWith(runner.os,'Linux')
if: ${{ startsWith(runner.os,'Linux') && matrix.builds.name != 'linux-arm64' }}
run: |
sudo apt-get update
sudo apt-get -y install \
Expand All @@ -125,11 +125,7 @@ jobs:
protobuf-compiler \
libncurses5-dev \
libncursesw5-dev \
zip \
gcc-aarch64-linux-gnu \
g++-aarch64-linux-gnu
sudo apt-get -y --purge remove \
clang-9 clang-format-9 libclang-common-9-dev libclang-cpp9 libclang1-9
zip

- name: Install macOS dependencies
if: startsWith(runner.os,'macOS')
Expand Down Expand Up @@ -182,25 +178,8 @@ jobs:
- name: Cache cargo files and outputs
uses: Swatinem/rust-cache@v1

# Fix me soon!
- name: Build rust binaries - hardcoded (linux-arm64)
if: ${{ matrix.builds.name == 'linux-arm64' }}
shell: bash
run: |
export RUSTFLAGS="-C target_cpu=generic"
export ROARING_ARCH=generic
export BUILD_TARGET="aarch64-unknown-linux-gnu/"
export RUST_TARGET="--target=aarch64-unknown-linux-gnu"
export ARCH=generic
export FEATURES=safe
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot /usr/aarch64-linux-gnu/include/"
cargo build --release --target ${{ matrix.builds.target }} --features ${{ matrix.builds.features }} ${{ matrix.builds.target_bins }}

- name: Build rust binaries - Normal
if: ${{ matrix.builds.name != 'linux-arm64' }}
#if: ${{ matrix.builds.name != 'linux-arm64' }}
uses: actions-rs/cargo@v1
env:
RUSTFLAGS: "-C target_cpu=${{ matrix.builds.target_cpu }}"
Expand Down
21 changes: 21 additions & 0 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,24 @@ passthrough = ["CFLAGS"]

[target.arm-linux-androideabi.env]
passthrough = ["CFLAGS"]

[target.aarch64-unknown-linux-gnu]
image = "ubuntu:18.04"
pre-build = [
"apt-get update && apt-get install --assume-yes cmake gcc clang-10 pkg-config-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && alias pkg-config=aarch64-linux-gnu-pkg-config"
]

[target.aarch64-unknown-linux-gnu.env]
passthrough = [
"RUST_DEBUG",
"RUSTFLAGS",
"ARCH",
"FEATURES",
"ROARING_ARCH",
"BUILD_TARGET=aarch64-unknown-linux-gnu/",
"RUST_TARGET=--target=aarch64-unknown-linux-gnu",
"CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc",
"CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc",
"CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++",
"BINDGEN_EXTRA_CLANG_ARGS=--sysroot /usr/aarch64-linux-gnu/include/",
]