wip: fix libqtsql dependency

nuttyartist · Feb 18, 2024 · f736fa0 · f736fa0
1 parent 1e74c99
commit f736fa0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -205,20 +205,20 @@ jobs:
     name: AppImage (${{ matrix.build-type }}, Qt ${{ matrix.qt-version }}, ${{ matrix.image }})
     runs-on: ${{ matrix.os }}
     container:
-      image: ${{ matrix.image }}
+      image: zjeffer/notes:${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-22.04
             build-type: release
             qt-version: 5.15.2
-            image: zjeffer/notes:ubuntu-aqtinstall-5
+            image: ubuntu-aqtinstall-5
 
           - os: ubuntu-22.04
             build-type: release
             qt-version: 6.4.3
-            image: zjeffer/notes:ubuntu-aqtinstall-6
+            image: ubuntu-aqtinstall-6
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -326,7 +326,7 @@ jobs:
           fi
 
       - name: Validate AppStream metadata
-        if: matrix.container != 'ubuntu:20.04'
+        if: matrix.image != 'ubuntu:20.04'
         run: |
           cd build/Notes
           appstreamcli validate --verbose 'usr/share/metainfo/${{ env.APP_ID }}.metainfo.xml'

diff --git a/Dockerfiles/ubuntu-aqtinstall-5 b/Dockerfiles/ubuntu-aqtinstall-5
@@ -21,9 +21,10 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
 # - sudo: Used by most GitHub actions to install things.
 # - libpq5: Useless, but needed to keep linuxdeploy happy
 # - libodbc1: Useless, but needed to keep linuxdeploy happy
+# - libqt5sql5: Useless, but needed to keep linuxdeploy happy
 RUN apt update && \ 
     apt install -y appstream cmake curl desktop-file-utils git libfontconfig1 libxcb-cursor0 libxkbcommon-x11-0 python3 python3-pip sudo \
-    libpq5 libodbc1 \
+    libpq5 libodbc1 libqt5sql5 \
     # qt dependencies
     build-essential libgl1-mesa-dev libgstreamer-gl1.0-0 libpulse-dev libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 \
     libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxkbcommon-dev libxkbcommon-x11-0 libxcb-xkb-dev

diff --git a/Dockerfiles/ubuntu-aqtinstall-6 b/Dockerfiles/ubuntu-aqtinstall-6
@@ -21,9 +21,10 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
 # - sudo: Used by most GitHub actions to install things.
 # - libpq5: Useless, but needed to keep linuxdeploy happy
 # - libodbc1: Useless, but needed to keep linuxdeploy happy
+# - libqt6sql6: Useless, but needed to keep linuxdeploy happy
 RUN apt update && \ 
     apt install -y appstream cmake curl desktop-file-utils git libfontconfig1 libxcb-cursor0 libxkbcommon-x11-0 python3 python3-pip sudo \
-    libpq5 libodbc1 \
+    libpq5 libodbc1 libqt6sql6 \
     # qt dependencies
     build-essential libgl1-mesa-dev libgstreamer-gl1.0-0 libpulse-dev libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 \
     libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxkbcommon-dev libxkbcommon-x11-0 libxcb-xkb-dev