Skip to content

Update CI Docker setup and fix recent issues #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheAssassin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update CI Docker setup and fix recent issues #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# current Debian oldstable as of Dec 2023
# we use Debian because they still provide i386 builds
# (also, they ship Qt 5.15.2, so we no longer have to rely on third-party builds)
# and it provides a C++17 compatible compiler out of the box!
FROM debian:bullseye
FROM debian:oldstable

ARG ARCH
ARG DOCKER_ARCH
Expand All @@ -17,13 +13,7 @@ RUN apt-get update && \
build-essential libssl-dev autoconf automake libtool \
wget vim-common desktop-file-utils pkgconf libgpgme-dev \
libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev \
liblzma-dev libzstd-dev zlib1g-dev libarchive-dev

RUN wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.28.0-debian-bullseye-"${CMAKE_ARCH}".tar.gz | \
tar xzv -C/usr --strip-components=1

COPY ./install-gtest.sh /
RUN bash /install-gtest.sh
liblzma-dev libzstd-dev zlib1g-dev libarchive-dev cmake googletest nlohmann-json3-dev

COPY pkgconfig/*.pc /
RUN mv /*.pc /usr/lib/*-linux-gnu*/pkgconfig/
Expand All @@ -32,17 +22,6 @@ ENV APPIMAGE_EXTRACT_AND_RUN=1

ENV DOCKER=1

#RUN git clone https://github.com/nlohmann/json.git -b v3.11.2 --depth=1 && \
# cd json && \
# mkdir build && \
# cd build && \
# cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local && \
# make -j "$(nproc --ignore=1)" install && \
# cd ../.. && \
# rm -rf json/

RUN apt-get update && apt-get install -y nlohmann-json3-dev

# work around bug in FindCURL.cmake, which does not parse the pkg-config provided protocols and features into lists causing
# the comparison in the loop to yield false negative results
# this makes it use curl-config which works much better
Expand Down
Loading