chore(CI)[sc-97670]: update CI to build With Qt 6.7.1

constructpm · Jul 10, 2024 · a9a1618 · a9a1618
1 parent 252f55d
commit a9a1618
Showing 1 changed file with 17 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,8 +11,8 @@ on:
       - v*
 
 env:
-  # 5.15.3 is the version of Qt you get when you install qt5 libraries via `apt install`
-  QTVERSION: 5.15.3
+  # 6.7.1 is the latest version of Qt we have built
+  QTVERSION: 6.7.1
 
 jobs:
   tar-src:
@@ -53,55 +53,46 @@ jobs:
         run: echo "artefact_name=qtwebdriver-${QTVERSION}-cpp${{ matrix.config.std }}-${{ matrix.config.os }}-x64.tar.gz" >> $GITHUB_OUTPUT
       - name: Install dependencies
         run: |
-          sudo apt-get -o Acquire::Retries=3 update
-          sudo apt-get -o Acquire::Retries=3 install -y \
+          sudo apt -o Acquire::Retries=3 update
+          sudo apt -o Acquire::Retries=3 install -y \
             gyp \
+            libdbus-1-dev \
             libegl1-mesa-dev \
             libglib2.0-dev \
             libgstreamer1.0-dev \
             libgstreamer-plugins-base1.0-dev \
+            libharfbuzz-icu0 \
             libhyphen-dev \
             libicu-dev \
             libjpeg-dev \
             libpng-dev \
             libunwind-dev \
             libxslt1-dev \
+            libwebpdemux2 \
+            libwoff1 \
+            libxkbcommon-dev
+
       - name: Install Qt
         run: |
-          sudo apt-get -o Acquire::Retries=3 install -y \
-            qtbase5-dev \
-            qtdeclarative5-dev \
-            qtmultimedia5-dev \
-            qtpositioning5-dev \
-            libqt5sensors5-dev \
-            libqt5webchannel5 \
-            qt5-qmake \
+          curl -L https://github.com/constructpm/qt-build/releases/download/v6.7.1-1/qt-6.7.1-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /opt
+
       - name: Install Qtwebkit
         run: |
-          curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v5.212.0-1/qtwebkit-d1c854e-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /usr/include/x86_64-linux-gnu
-          
-          # Move the files we downloaded so their locations match the locations used by the other Qt libraries we installed earlier
-          sudo mv /usr/include/x86_64-linux-gnu/qt5/include/* /usr/include/x86_64-linux-gnu/qt5/
-          sudo rmdir /usr/include/x86_64-linux-gnu/qt5/include/
-
-          sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/cmake/* /usr/lib/x86_64-linux-gnu/cmake/
-          sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/cmake/
-
-          sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/* /usr/lib/x86_64-linux-gnu/pkgconfig/
-          sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/
-          
-          sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/* /usr/lib/x86_64-linux-gnu/
-          sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/
+          curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v6.212.0-1/qtwebkit-ee690e4-cpp17-ubuntu-22.04-x64.tar.gz | sudo tar xvJ -C /opt
+
       - name: checkout
         uses: actions/checkout@v4
+
       - name: Build
         working-directory: ${{ github.workspace }}
         run: ./build.sh
+
       - name: Archive
         working-directory: ${{ github.workspace }}
         run: |
           mv out qtwebdriver
           tar cJfv "${{ steps.config.outputs.artefact_name }}" qtwebdriver
+
       - name: Upload
         uses: actions/upload-artifact@v4
         with: