From 0633b3fd6265de9c76dbf3c3a2539e1532147018 Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Sat, 2 Nov 2024 00:00:00 +0000 Subject: [PATCH] ci(build): fixed build pipeline boost dependency Signed-off-by: k4yt3x --- .github/workflows/build.yml | 5 +++-- packaging/docker/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2061085..b70d2e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,8 @@ jobs: libvulkan-dev \ glslang-tools \ libomp-dev \ - libopencv-dev + libopencv-dev \ + libboost-program-options-dev - name: Build Video2X run: | mkdir -p /tmp/build /tmp/install @@ -83,7 +84,7 @@ jobs: shell: pwsh run: | cmake -S . -B build ` - -DUSE_SYSTEM_NCNN=OFF -DUSE_SYSTEM_SPDLOG=OFF -DUSE_SYSTEM_OPENCV=OFF ` + -DUSE_SYSTEM_NCNN=OFF -DUSE_SYSTEM_SPDLOG=OFF -DUSE_SYSTEM_OPENCV=OFF -DUSE_SYSTEM_BOOST=OFF ` -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=build/video2x_install cmake --build build --config Debug --parallel --target install - name: Upload artifacts diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 5583cdc..d0396d7 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,7 +1,7 @@ # Name: Video2X Dockerfile # Creator: K4YT3X # Date Created: February 3, 2022 -# Last Modified: October 30, 2024 +# Last Modified: November 1, 2024 # stage 1: build the python components into wheels FROM docker.io/archlinux:latest AS builder @@ -9,7 +9,7 @@ FROM docker.io/archlinux:latest AS builder # Install dependencies and create a non-root user RUN pacman -Syy --noconfirm \ base-devel git cmake make clang pkgconf sudo \ - ffmpeg ncnn vulkan-headers openmp spdlog opencv \ + ffmpeg ncnn vulkan-headers openmp spdlog opencv boost \ nvidia-utils vulkan-radeon vulkan-intel vulkan-swrast \ && useradd -m builder \ && echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder @@ -38,7 +38,7 @@ ENV VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/nvidia_icd.json\ COPY --from=builder /tmp/video2x.pkg.tar.zst /video2x.pkg.tar.zst RUN pacman -Sy --noconfirm nvidia-utils vulkan-radeon vulkan-intel vulkan-swrast \ - ffmpeg ncnn spdlog opencv \ + ffmpeg ncnn spdlog opencv boost-libs \ && pacman -U --noconfirm /video2x.pkg.tar.zst \ && rm -rf /video2x.pkg.tar.zst /var/cache/pacman/pkg/*