Skip to content

Commit

Permalink
CI: Fix release artifact build
Browse files Browse the repository at this point in the history
`dhall` crate pulls in `reqwest` dependency, which requires OpenSSL in
some platforms.
  • Loading branch information
tesaguri committed Aug 13, 2020
1 parent e6c45a3 commit 9582560
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ jobs:
strategy:
matrix:
target:
- x86_64-unknown-linux-musl
- x86_64-unknown-linux-gnu
- armv7-unknown-linux-gnueabihf
- x86_64-apple-darwin
- x86_64-pc-windows-msvc
- x86_64-unknown-freebsd
include:
- target: x86_64-unknown-linux-musl
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
- target: armv7-unknown-linux-gnueabihf
os: ubuntu-latest
Expand All @@ -137,9 +137,9 @@ jobs:
use_cross: true
steps:
- uses: actions/checkout@v2
- name: Install packages (x86_64-unknown-linux-musl)
if: matrix.target == 'x86_64-unknown-linux-musl'
run: sudo apt-get install libsqlite3-dev musl-tools
- name: Install packages (x86_64-unknown-linux-gnu)
if: matrix.target == 'x86_64-unknown-linux-gnu'
run: sudo apt-get install libsqlite3-dev libssl-dev
- name: Install packages (Windows)
if: runner.os == 'Windows'
run: vcpkg install sqlite3:x64-windows
Expand Down
5 changes: 4 additions & 1 deletion docker/armv7-unknown-linux-gnueabihf/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1

RUN dpkg --add-architecture armhf && \
apt-get update && \
apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:armhf
apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:armhf libssl-dev:armhf

ENV PKG_CONFIG_ALLOW_CROSS_armv7_unknown_linux_gnueabihf=1 \
PKG_CONFIG_PATH_armv7_unknown_linux_gnueabihf='/usr/lib/arm-linux-gnueabihf/pkgconfig'

0 comments on commit 9582560

Please sign in to comment.