forked from tari-project/sha-p2pool
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci(fix): resolve x86 linux build (tari-project#10)
Description Resolve x86 linux builds Add cross-compile options that mostly work - need to resolve arm64 cross-compile from x86 Motivation and Context Provide runtime assets How Has This Been Tested? Builds locally and in local fork What process can a PR reviewer use to test or verify this change? --- <!-- Checklist --> <!-- 1. Is the title of your PR in the form that would make nice release notes? The title, excluding the conventional commit tag, will be included exactly as is in the CHANGELOG, so please think about it carefully. --> Breaking Changes --- - [x] None - [ ] Requires data directory on base node to be deleted - [ ] Requires hard fork - [ ] Other - Please specify <!-- Does this include a breaking change? If so, include this line as a footer --> <!-- BREAKING CHANGE: Description what the user should do, e.g. delete a database, resync the chain -->
- Loading branch information
Showing
6 changed files
with
67 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[advisories] | ||
ignore = [ | ||
|
||
# We are not using a special allocator and will not suffer this issue | ||
"RUSTSEC-2021-0145", | ||
# We are not using RSA | ||
"RUSTSEC-2023-0071" | ||
|
||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,14 @@ | ||
[target.aarch64-unknown-linux-gnu] | ||
linker = "aarch64-linux-gnu-gcc" | ||
|
||
[target.riscv64gc-unknown-linux-gnu] | ||
linker = "riscv64-linux-gnu-gcc" | ||
|
||
[alias] | ||
ci-fmt = "fmt --all -- --check" | ||
ci-fmt-fix = "fmt --all" | ||
ci-clippy = "lints clippy --all-targets --all-features" | ||
ci-test-compile = "test --no-run --workspace --all-features --no-default-features" | ||
ci-test = "nextest run --all-features --release --workspace --exclude integration_tests --profile ci" | ||
ci-cucumber = "test --all-features --release --package integration_tests" | ||
ci-check = "check --workspace --release --all-features --all-targets --locked" | ||
ci-check = "check --workspace --release --all-features --all-targets --locked" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,41 @@ | ||
[build.env] | ||
passthrough = [ | ||
"CFLAGS", | ||
"TARGET", | ||
"RUST_TARGET", | ||
"BUILD_TARGET", | ||
"CARGO_BUILD_TARGET", | ||
"TARGET_CFLAGS", | ||
"CC_aarch64_unknown_linux_gnu", | ||
"PKG_CONFIG_SYSROOT_DIR", | ||
"PKG_CONFIG_ALLOW_CROSS", | ||
"RUSTFLAGS", | ||
"RUST_BACKTRACE", | ||
"RUST_DEBUG", | ||
"RUST_LOG", | ||
"ARCH", | ||
"FEATURES", | ||
"ROARING_ARCH", | ||
"TARI_NETWORK", | ||
"TARI_TARGET_NETWORK", | ||
"TARI_NETWORK_DIR", | ||
] | ||
|
||
# Currently needs cross-rs from git | ||
# ```cargo install cross --git https://github.com/cross-rs/cross``` | ||
[target.aarch64-unknown-linux-gnu] | ||
image.name = "ubuntu:18.04" | ||
# targetting is needed for apple silicon | ||
image.toolchain = ["linux/arm64=aarch64-unknown-linux-gnu", "linux/amd64=x86_64-unknown-linux-gnu"] | ||
pre-build = "./scripts/cross_compile_ubuntu_18-pre-build.sh" | ||
|
||
[target.aarch64-unknown-linux-gnu.env] | ||
passthrough = [ | ||
"CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc", | ||
"PKG_CONFIG_SYSROOT_DIR=/usr/lib/aarch64-linux-gnu/", | ||
"PKG_CONFIG_ALLOW_CROSS=true", | ||
] | ||
|
||
[target.x86_64-unknown-linux-gnu] | ||
pre-build = [ | ||
"dpkg --add-architecture $CROSS_DEB_ARCH", | ||
"apt-get update", | ||
"apt-get install --no-install-recommends --assume-yes apt-transport-https ca-certificates curl gpg bash less openssl libssl-dev pkg-config libsqlite3-dev:$CROSS_DEB_ARCH libsqlite3-0:$CROSS_DEB_ARCH libreadline-dev git cmake dh-autoreconf clang g++ libc++-dev libc++abi-dev libprotobuf-dev protobuf-compiler:$CROSS_DEB_ARCH libncurses5-dev libncursesw5-dev libudev-dev libhidapi-dev zip" | ||
] | ||
image = "ubuntu:18.04" | ||
pre-build = "./scripts/cross_compile_ubuntu_18-pre-build.sh" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[toolchain] | ||
channel = "stable" |