Skip to content

Commit c7a90f4

Browse files
committed
Fix build on GitHub actions
1 parent d849b62 commit c7a90f4

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-18.04
99
env:
1010
ARCH: x86_64
11-
DIST: xenial
11+
DIST: bionic
1212
steps:
1313
- uses: actions/checkout@v2
1414
with:

ci/Dockerfile.xenial-i386 renamed to ci/Dockerfile.bionic-i386

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
FROM i386/ubuntu:xenial
1+
FROM i386/ubuntu:bionic
22

33
ENV ARCH=i386
44

55
RUN apt-get update && \
66
apt-get install -y \
7-
gcc g++ clang make cmake libxpm-dev git libcurl4-openssl-dev wget zlib1g-dev libc6-dev bsdmainutils
7+
gcc g++ clang make cmake libxpm-dev git libcurl4-openssl-dev wget zlib1g-dev libc6-dev bsdmainutils pkgconf libgcrypt11-dev
88

99
RUN wget https://artifacts.assassinate-you.net/prebuilt-cmake/continuous/cmake-v3.19.1-ubuntu_xenial-i386.tar.gz -O- | \
1010
tar xz -C /usr/local --strip-components=1
1111

12+
COPY libgcrypt.pc /usr/lib/i386-linux-gnu/pkgconfig/libgcrypt.pc
13+
RUN sed -i 's|x86_64|i386|g' /usr/lib/i386-linux-gnu/pkgconfig/libgcrypt.pc
14+
1215
ARG UID
1316
RUN adduser --system --group --uid "$UID" build
1417
USER build

ci/Dockerfile.xenial-x86_64 renamed to ci/Dockerfile.bionic-x86_64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
FROM ubuntu:xenial
1+
FROM ubuntu:bionic
22

33
ENV ARCH=x86_64
44

55
RUN apt-get update && \
66
apt-get install -y \
7-
gcc g++ clang make cmake libxpm-dev git libcurl4-openssl-dev wget zlib1g-dev libc6-dev bsdmainutils
7+
gcc g++ clang make cmake libxpm-dev git libcurl4-openssl-dev wget zlib1g-dev libc6-dev bsdmainutils pkgconf libgcrypt11-dev
88

99
RUN wget https://artifacts.assassinate-you.net/prebuilt-cmake/continuous/cmake-v3.19.1-ubuntu_xenial-x86_64.tar.gz -O- | \
1010
tar xz -C /usr/local --strip-components=1
1111

12+
COPY libgcrypt.pc /usr/lib/x86_64-linux-gnu/pkgconfig/libgcrypt.pc
13+
1214
ARG UID
1315
RUN adduser --system --group --uid "$UID" build
1416
USER build

ci/libgcrypt.pc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
prefix=/usr
2+
exec_prefix=${prefix}
3+
includedir=${prefix}/include
4+
libdir=${prefix}/lib/x86_64-linux-gnu
5+
host=x86_64-pc-linux-gnu
6+
7+
Name: libgcrypt
8+
Description: General purpose cryptographic library
9+
Requires.private: gpg-error
10+
Version: 1.8.1
11+
Cflags:
12+
Libs: -lgcrypt
13+
URL: https://www.gnupg.org/software/libgcrypt/index.html

0 commit comments

Comments
 (0)