Skip to content

Commit b23943e

Browse files
committed
chore(CI)[sc-97669]: update CI to match the devcontainer setup script
1 parent 99d3932 commit b23943e

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,31 @@ jobs:
6666
libunwind-dev \
6767
libxslt1-dev \
6868
- name: Install Qt
69-
run: curl -L https://github.com/constructpm/qt-build/releases/download/v5.15.8-lts-lgpl-1/qt-5.15.8-lts-lgpl-cpp17-${{ matrix.config.os }}-x64.tar.gz | sudo tar -xJC /opt
69+
run: |
70+
sudo apt-get -o Acquire::Retries=3 install -y \
71+
qtbase5-dev \
72+
qtdeclarative5-dev \
73+
qtmultimedia5-dev \
74+
qtpositioning5-dev \
75+
libqt5sensors5-dev \
76+
libqt5webchannel5 \
77+
qt5-qmake \
7078
- name: Install Qtwebkit
71-
run: curl -L https://github.com/constructpm/qtwebkit-build/releases/download/v5.212.0-1/qtwebkit-d1c854e-cpp17-${{ matrix.config.os }}-x64.tar.gz | sudo tar xvJ -C /opt
79+
run: |
80+
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
81+
82+
# Move the files we downloaded so their locations match the locations used by the other Qt libraries we installed earlier
83+
sudo mv /usr/include/x86_64-linux-gnu/qt5/include/* /usr/include/x86_64-linux-gnu/qt5/
84+
sudo rmdir /usr/include/x86_64-linux-gnu/qt5/include/
85+
86+
sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/cmake/* /usr/lib/x86_64-linux-gnu/cmake/
87+
sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/cmake/
88+
89+
sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/* /usr/lib/x86_64-linux-gnu/pkgconfig/
90+
sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/pkgconfig/
91+
92+
sudo mv /usr/include/x86_64-linux-gnu/qt5/lib/* /usr/lib/x86_64-linux-gnu/
93+
sudo rmdir /usr/include/x86_64-linux-gnu/qt5/lib/
7294
- name: checkout
7395
uses: actions/checkout@v4
7496
- name: Build

0 commit comments

Comments
 (0)