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

re-enable linux arm64 builds #1060

Merged
merged 6 commits into from
Aug 25, 2023
Merged

re-enable linux arm64 builds #1060

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a440a3f
run per-arch build targets with cargo rustc --crate-type lib explicitly
graydon Aug 24, 2023
3f36258
Add comment and move workaround into a flag
leighmcculloch Aug 24, 2023
9dae6c6
Add --workspace which is required with --exclude
leighmcculloch Aug 24, 2023
d78dcd7
Merge branch 'main' into arm64
leighmcculloch Aug 24, 2023
d48b48b
Merge branch 'main' into arm64
leighmcculloch Aug 25, 2023
0a60b92
Merge branch 'main' into arm64
leighmcculloch Aug 25, 2023
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
17 changes: 12 additions & 5 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,14 @@ jobs:
sys:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
# TODO: Figure out why builds are broken for linux arm64 and reenable.
# https://github.com/stellar/rs-soroban-sdk/issues/1011
# - os: ubuntu-latest
# target: aarch64-unknown-linux-gnu
- os: ubuntu-latest
target: aarch64-unknown-linux-gnu
# Fix #1011 by avoiding the use of crate-type = ["cdylib"] in native
# builds that cross-compile. It causes linker errors. The root cause
# is rust-lang/cargo#4133. This workaround uses rustc to build for a
# specific crate-type, lib, such that the Cargo.toml crate-type is
# ignored.
cdylib-cross-compile-workaround: true
- os: macos-latest
target: x86_64-apple-darwin
- os: macos-latest
Expand All @@ -85,7 +89,10 @@ jobs:
name: cargo-hack
version: 0.5.16
- run: cargo-hack hack build --target wasm32-unknown-unknown --profile release
- run: cargo-hack hack --feature-powerset --exclude-features docs build --target ${{ matrix.sys.target }}
- if: "!matrix.sys.cdylib-cross-compile-workaround"
run: cargo-hack hack --feature-powerset --exclude-features docs build --target ${{ matrix.sys.target }}
- if: "matrix.sys.cdylib-cross-compile-workaround"
run: cargo-hack hack --feature-powerset --exclude-features docs rustc --workspace --exclude soroban-sdk-macros --crate-type lib --target ${{ matrix.sys.target }}
- if: startsWith(matrix.sys.target, 'x86_64')
run: cargo-hack hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test --target ${{ matrix.sys.target }}

Expand Down