ci: add missing pkg-config

variar · Nov 24, 2024 · 025cbc1 · 025cbc1
1 parent 5c77b45
commit 025cbc1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -259,6 +259,11 @@ jobs:
         with:
           arch: ${{ matrix.config.arch }}
 
+      - name: Add pkg-config
+        shell: sh
+        run: |
+          choco install pkgconfiglite
+
       - uses: ./.github/actions/agent-build
       - uses: ./.github/actions/agent-run-tests
       - uses: ./.github/actions/agent-package-win

diff --git a/docker/ubuntu20.04/Dockerfile b/docker/ubuntu20.04/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update -y && \
     apt-get install --no-install-recommends build-essential \
                     qtbase5-dev qt5-qmake qtbase5-dev-tools qttools5-dev qttranslations5-l10n\
                     libboost-dev libssl-dev libicu-dev libcurl4-openssl-dev \
-                    ragel ninja-build zlib1g-dev git \
+                    ragel ninja-build zlib1g-dev git pkg-config \
                     wget ca-certificates fuse file -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/ubuntu20.04_qt5.15/Dockerfile b/docker/ubuntu20.04_qt5.15/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update -y && \
                     qt515base qt515svg qt515tools qt515imageformats qt515translations \
                     mesa-common-dev libglu1-mesa-dev \
                     libboost-dev libicu-dev libssl-dev libcurl4-openssl-dev \
-                    ragel ninja-build zlib1g-dev git \
+                    ragel ninja-build zlib1g-dev git pkg-config \ 
                     wget ca-certificates fuse file -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/ubuntu22.04/Dockerfile b/docker/ubuntu22.04/Dockerfile
@@ -6,7 +6,7 @@ RUN apt update -y && \
     apt install --no-install-recommends build-essential \
                     qtbase5-dev qt5-qmake qtbase5-dev-tools qttools5-dev qttranslations5-l10n \
                     libboost-dev libssl-dev libcurl4-openssl-dev \
-                    ragel ninja-build zlib1g-dev git \
+                    ragel ninja-build zlib1g-dev git pkg-config \
                     wget ca-certificates fuse file -y && \
     apt clean && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/ubuntu24.04/Dockerfile b/docker/ubuntu24.04/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update -y && \
                     qt6-base-dev qt6-5compat-dev qt6-translations-l10n \
                     qt6-tools-dev-tools qt6-base-dev-tools qt6-tools-dev \
                     libboost-dev libicu-dev libssl-dev libcurl4-openssl-dev \
-                    ragel ninja-build zlib1g-dev git \
+                    ragel ninja-build zlib1g-dev git pkg-config \
                     wget ca-certificates fuse file -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*