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

aarch64 apple darwin #29

Merged
merged 6 commits into from
May 19, 2021
Merged

aarch64 apple darwin #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa79f2c
add aarch64-apple-darwin target
franziskuskiefer May 11, 2021
f895dd7
ios target
franziskuskiefer May 17, 2021
2ee4ddb
Merge branch 'master' into aarch64-apple-darwin
franziskuskiefer May 17, 2021
99ac4a5
Update evercrypt-rs.yml
franziskuskiefer May 17, 2021
2d2c884
disable evercrypt-sys build
franziskuskiefer May 17, 2021
047e27e
remove x86_64-apple-ios for now
franziskuskiefer May 19, 2021
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
26 changes: 20 additions & 6 deletions .github/workflows/evercrypt-rs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,24 @@ jobs:
- if: matrix.os == 'ubuntu-latest'
run: sudo apt -y install pkg-config
- if: matrix.os == 'macos-latest'
run: brew install pkg-config
run: |
brew install pkg-config
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
sudo xcode-select -s /Applications/Xcode_12.4.app
rustup target install aarch64-apple-darwin
rustup target install aarch64-apple-ios
- name: Build
run: cargo build --verbose
- name: Apple Silicon Build
if: matrix.os == 'macos-latest'
run: |
cd evercrypt-rs
cargo build --verbose --release
- name: Test evercrypt-sys
cargo build --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes
cargo build --release --target aarch64-apple-darwin --tests --verbose --features rust-crypto-aes
- name: iOS aarch64
if: matrix.os == 'macos-latest'
run: |
cd evercrypt-sys
cargo test --verbose
cargo build --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes
cargo build --release --target aarch64-apple-ios --tests --verbose --features rust-crypto-aes
- if: matrix.os == 'ubuntu-latest'
name: Test evercrypt-rs
run: |
Expand All @@ -55,6 +64,11 @@ jobs:
run: |
cd evercrypt-rs
cargo test --verbose --all-features
- name: Release (all-features)
run: |
cd evercrypt-rs
cargo clean
cargo test --release --verbose --all-features
- name: Benchmark (rust-crypto-aes)
run: |
cd evercrypt-rs
Expand Down
3 changes: 2 additions & 1 deletion evercrypt-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,9 @@ fn main() {

// Make sure we can build for the given OS and architecture.
let build_config = match target.as_str() {
// No 32-bit support on any platform for now.
"x86_64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "x86_64-apple-darwin"]),
"aarch64-apple-darwin" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-darwin"]),
"aarch64-apple-ios" => cfg.set_cross_config_flags(vec!["-target", "aarch64-apple-ios"]),
"i686-unknown-linux-gnu" => cfg.set_cross_config_flags(vec!["-target", "ia32"]),
"x86_64-unknown-linux-gnu" => {
cfg.set_cross_config_flags(vec!["-target", "x86_64-unknown-linux-gnu"])
Expand Down