Skip to content

Commit 09c043c

Browse files
committed
Revert "device transfer: replace picky with boring"
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.)
1 parent 36795d0 commit 09c043c

File tree

9 files changed

+339
-249
lines changed

9 files changed

+339
-249
lines changed

.github/workflows/build_and_test.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
steps:
8787
- uses: actions/checkout@v2
8888

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

9191
- name: Install Rust
9292
run: rustup +stable target add i686-unknown-linux-gnu
@@ -127,7 +127,7 @@ jobs:
127127
steps:
128128
- uses: actions/checkout@v2
129129

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

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

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

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

181-
- name: Install boring cross-compile dependencies
182-
run: sudo apt-get update && sudo apt-get install gcc-multilib
183-
184183
- name: Install Rust
185184
uses: actions-rs/toolchain@v1
186185
with:
@@ -231,12 +230,6 @@ jobs:
231230
shell: bash
232231
run: echo "::set-output name=node-version::$(cat .nvmrc)"
233232

234-
# install nasm compiler for boring
235-
- name: Install nasm
236-
if: startsWith(matrix.os, 'windows')
237-
run: choco install nasm
238-
shell: cmd
239-
240233
- uses: actions/setup-node@v2
241234
with:
242235
node-version: ${{ steps.get-nvm-version.outputs.node-version }}
@@ -325,3 +318,4 @@ jobs:
325318
run: pod lib lint --verbose --platforms=ios --include-podspecs=SignalCoreKit/SignalCoreKit.podspec --skip-import-validation
326319
env:
327320
XCODE_XCCONFIG_FILE: swift/PodLibLint.xcconfig
321+

0 commit comments

Comments
 (0)