CI: cleanup

.github/workflows/ci.yml

@@ -90,15 +90,13 @@ jobs:
         modules: 'qtmultimedia'
         tools: "tools_ninja${{ startsWith(matrix.os, 'windows') && ' tools_opensslv3_x64' || '' }}"
 
-    # Install on Linux via apt to get Qt built with OpenSSL 3
+    # Install on Linux via apt to test against Qt coming from the package manager
     - name: Install dependencies (Linux)
       if: startsWith(matrix.os, 'ubuntu')
       run: |
-        COMMON_PKGS="libolm-dev ninja-build"
-        sudo apt-get -qq update
-        sudo apt-get -qq install $COMMON_PKGS \
-                libgl1-mesa-dev qt6-declarative-dev qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
-                qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev
+        sudo apt-get -qq install libolm-dev ninja-build \
+            qt6-declarative-dev qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
+            qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev
 
     - name: Setup environment
       run: |
@@ -114,8 +112,7 @@ jobs:
               -DCMAKE_PREFIX_PATH=~/.local \
               ${{ runner.os == 'macOS' && '-DOPENSSL_ROOT_DIR=`brew --prefix openssl`' ||
                   runner.os == 'Windows' && '-DOPENSSL_ROOT_DIR=$IQTA_TOOLS/OpenSSLv3/Win_x64/' || '' }} \
-              -DBUILD_SHARED_LIBS=${{ matrix.composition == 'dynamic' }} \
-              -DBUILD_WITH_QT6=ON" \
+              -DBUILD_SHARED_LIBS=${{ matrix.composition == 'dynamic' }}" \
             >>$GITHUB_ENV
 
     - name: Setup MSVC environment
@@ -129,7 +126,7 @@ jobs:
       run: |
         git clone --depth=1 -b $QTKEYCHAIN_REF https://github.com/frankosterfeld/qtkeychain
         cd qtkeychain
-        cmake -S . -B build $CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=~/.local
+        cmake -S . -B build $CMAKE_ARGS -DBUILD_WITH_QT6=ON -DCMAKE_INSTALL_PREFIX=~/.local
         cmake --build build --target install
         if [[ '${{ matrix.composition }}' == 'dynamic' ]]; then
             QTKEYCHAIN_SO_PATH=$(dirname $(find ~/.local/lib* -name 'libqt?keychain.so'))