Skip to content

Commit 9582560

Browse files
committed
CI: Fix release artifact build
`dhall` crate pulls in `reqwest` dependency, which requires OpenSSL in some platforms.
1 parent e6c45a3 commit 9582560

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/cicd.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ jobs:
117117
strategy:
118118
matrix:
119119
target:
120-
- x86_64-unknown-linux-musl
120+
- x86_64-unknown-linux-gnu
121121
- armv7-unknown-linux-gnueabihf
122122
- x86_64-apple-darwin
123123
- x86_64-pc-windows-msvc
124124
- x86_64-unknown-freebsd
125125
include:
126-
- target: x86_64-unknown-linux-musl
126+
- target: x86_64-unknown-linux-gnu
127127
os: ubuntu-latest
128128
- target: armv7-unknown-linux-gnueabihf
129129
os: ubuntu-latest
@@ -137,9 +137,9 @@ jobs:
137137
use_cross: true
138138
steps:
139139
- uses: actions/checkout@v2
140-
- name: Install packages (x86_64-unknown-linux-musl)
141-
if: matrix.target == 'x86_64-unknown-linux-musl'
142-
run: sudo apt-get install libsqlite3-dev musl-tools
140+
- name: Install packages (x86_64-unknown-linux-gnu)
141+
if: matrix.target == 'x86_64-unknown-linux-gnu'
142+
run: sudo apt-get install libsqlite3-dev libssl-dev
143143
- name: Install packages (Windows)
144144
if: runner.os == 'Windows'
145145
run: vcpkg install sqlite3:x64-windows

docker/armv7-unknown-linux-gnueabihf/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1
22

33
RUN dpkg --add-architecture armhf && \
44
apt-get update && \
5-
apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:armhf
5+
apt-get install --assume-yes libsqlite3-dev libsqlite3-dev:armhf libssl-dev:armhf
6+
7+
ENV PKG_CONFIG_ALLOW_CROSS_armv7_unknown_linux_gnueabihf=1 \
8+
PKG_CONFIG_PATH_armv7_unknown_linux_gnueabihf='/usr/lib/arm-linux-gnueabihf/pkgconfig'

0 commit comments

Comments
 (0)