Skip to content

Commit

Permalink
Revert "device transfer: replace picky with boring"
Browse files Browse the repository at this point in the history
We need to work out more kinks cross-compiling boring-sys, so revert
this for now. (But keep the fix to use the correct Android NDK.)
  • Loading branch information
jrose-signal committed Jun 22, 2022
1 parent 36795d0 commit 09c043c
Show file tree
Hide file tree
Showing 9 changed files with 339 additions and 249 deletions.
18 changes: 6 additions & 12 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- run: sudo apt-get update && sudo apt-get install gcc-multilib g++-multilib
- run: sudo apt-get update && sudo apt-get install gcc-multilib

- name: Install Rust
run: rustup +stable target add i686-unknown-linux-gnu
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- run: sudo apt-get update && sudo apt-get install gcc-multilib g++-multilib
- run: sudo apt-get update && sudo apt-get install gcc-multilib

- name: Install Rust
uses: actions-rs/toolchain@v1
Expand All @@ -154,8 +154,10 @@ jobs:
run: cargo test --all --verbose -- -Z unstable-options --include-ignored

- name: Run tests (32-bit)
# Exclude device-transfer because OpenSSL, used for reference results,
# doesn't support the --target option.
# Exclude signal-neon-futures because those tests run Node
run: cargo test --all --verbose --target i686-unknown-linux-gnu --exclude signal-neon-futures -- -Z unstable-options --include-ignored
run: cargo test --all --verbose --target i686-unknown-linux-gnu --exclude device-transfer --exclude signal-neon-futures -- -Z unstable-options --include-ignored

- name: Build benches
run: cargo build --benches --verbose
Expand All @@ -178,9 +180,6 @@ jobs:
- name: Install NDK
run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VERSION}"

- name: Install boring cross-compile dependencies
run: sudo apt-get update && sudo apt-get install gcc-multilib

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -231,12 +230,6 @@ jobs:
shell: bash
run: echo "::set-output name=node-version::$(cat .nvmrc)"

# install nasm compiler for boring
- name: Install nasm
if: startsWith(matrix.os, 'windows')
run: choco install nasm
shell: cmd

- uses: actions/setup-node@v2
with:
node-version: ${{ steps.get-nvm-version.outputs.node-version }}
Expand Down Expand Up @@ -325,3 +318,4 @@ jobs:
run: pod lib lint --verbose --platforms=ios --include-podspecs=SignalCoreKit/SignalCoreKit.podspec --skip-import-validation
env:
XCODE_XCCONFIG_FILE: swift/PodLibLint.xcconfig

Loading

0 comments on commit 09c043c

Please sign in to comment.