|
11 | 11 | - v* |
12 | 12 |
|
13 | 13 | env: |
14 | | - # 5.15.3 is the version of Qt you get when you install qt5 libraries via `apt install` |
15 | | - QTVERSION: 5.15.3 |
| 14 | + # 6.7.1 is the latest version of Qt we have built |
| 15 | + QTVERSION: 6.7.1 |
16 | 16 |
|
17 | 17 | jobs: |
18 | 18 | tar-src: |
@@ -53,55 +53,46 @@ jobs: |
53 | 53 | run: echo "artefact_name=qtwebdriver-${QTVERSION}-cpp${{ matrix.config.std }}-${{ matrix.config.os }}-x64.tar.gz" >> $GITHUB_OUTPUT |
54 | 54 | - name: Install dependencies |
55 | 55 | run: | |
56 | | - sudo apt-get -o Acquire::Retries=3 update |
57 | | - sudo apt-get -o Acquire::Retries=3 install -y \ |
| 56 | + sudo apt -o Acquire::Retries=3 update |
| 57 | + sudo apt -o Acquire::Retries=3 install -y \ |
58 | 58 | gyp \ |
| 59 | + libdbus-1-dev \ |
59 | 60 | libegl1-mesa-dev \ |
60 | 61 | libglib2.0-dev \ |
61 | 62 | libgstreamer1.0-dev \ |
62 | 63 | libgstreamer-plugins-base1.0-dev \ |
| 64 | + libharfbuzz-icu0 \ |
63 | 65 | libhyphen-dev \ |
64 | 66 | libicu-dev \ |
65 | 67 | libjpeg-dev \ |
66 | 68 | libpng-dev \ |
67 | 69 | libunwind-dev \ |
68 | 70 | libxslt1-dev \ |
| 71 | + libwebpdemux2 \ |
| 72 | + libwoff1 \ |
| 73 | + libxkbcommon-dev |
| 74 | +
|
69 | 75 | - name: Install Qt |
70 | 76 | run: | |
71 | | - sudo apt-get -o Acquire::Retries=3 install -y \ |
72 | | - qtbase5-dev \ |
73 | | - qtdeclarative5-dev \ |
74 | | - qtmultimedia5-dev \ |
75 | | - qtpositioning5-dev \ |
76 | | - libqt5sensors5-dev \ |
77 | | - libqt5webchannel5 \ |
78 | | - qt5-qmake \ |
| 77 | + 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 |
| 78 | +
|
79 | 79 | - name: Install Qtwebkit |
80 | 80 | run: | |
81 | | - 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 |
82 | | - |
83 | | - # Move the files we downloaded so their locations match the locations used by the other Qt libraries we installed earlier |
84 | | - sudo mv /usr/include/x86_64-linux-gnu/qt5/include/* /usr/include/x86_64-linux-gnu/qt5/ |
85 | | - sudo rmdir /usr/include/x86_64-linux-gnu/qt5/include/ |
86 | | -
|
87 | | - sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/cmake/* /usr/lib/x86_64-linux-gnu/cmake/ |
88 | | - sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/cmake/ |
89 | | -
|
90 | | - sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/* /usr/lib/x86_64-linux-gnu/pkgconfig/ |
91 | | - sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/ |
92 | | - |
93 | | - sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/* /usr/lib/x86_64-linux-gnu/ |
94 | | - sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/ |
| 81 | + 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 |
| 82 | +
|
95 | 83 | - name: checkout |
96 | 84 | uses: actions/checkout@v4 |
| 85 | + |
97 | 86 | - name: Build |
98 | 87 | working-directory: ${{ github.workspace }} |
99 | 88 | run: ./build.sh |
| 89 | + |
100 | 90 | - name: Archive |
101 | 91 | working-directory: ${{ github.workspace }} |
102 | 92 | run: | |
103 | 93 | mv out qtwebdriver |
104 | 94 | tar cJfv "${{ steps.config.outputs.artefact_name }}" qtwebdriver |
| 95 | +
|
105 | 96 | - name: Upload |
106 | 97 | uses: actions/upload-artifact@v4 |
107 | 98 | with: |
|
0 commit comments