Install aqt in appimage builder

streetpea · Nov 30, 2024 · d6871f3 · d6871f3
1 parent 7256d66
commit d6871f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build-weekly.yaml b/.github/workflows/build-weekly.yaml
@@ -87,7 +87,6 @@ jobs:
           version: "6.8.*"
           host: 'windows'
           target: 'desktop'
-          arch: 'win64_msvc2019_64'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets'
 
       - name: Setup ffmpeg

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -66,7 +66,6 @@ jobs:
           version: "6.8.*"
           host: 'windows'
           target: 'desktop'
-          arch: 'win64_msvc2019_64'
           modules: 'qtwebengine qtpositioning qtwebchannel qtwebsockets'
 
       - name: Setup ffmpeg

diff --git a/scripts/Dockerfile.qt6 b/scripts/Dockerfile.qt6
@@ -1,6 +1,5 @@
-ARG QT_VERSION=6.8
-FROM docker.io/stateoftheartio/qt6:${QT_VERSION}-gcc-aqt
-RUN aqt install-qt linux desktop ${QT_VERSION} linux_gcc_6 -m qtwebengine qtpositioning qtwebchannel qtwebsockets
+FROM docker.io/stateoftheartio/qt6:6.8-gcc-aqt
+
 RUN sudo apt-get update
 RUN sudo apt-get install -y software-properties-common gpg wget
 RUN sudo add-apt-repository ppa:deadsnakes/ppa
@@ -13,6 +12,7 @@ RUN sudo apt-get -y install \
     pkg-config \
     unzip \
     python3-pip \
+    libglib2.0-0 \
     libssl-dev \
     libopus-dev  \
     libgl1-mesa-dev \
@@ -37,7 +37,8 @@ RUN sudo apt-get -y install \
 
 RUN sudo pip3 install protobuf==3.19.5
 RUN sudo pip3 install meson==1.3.0
-
+RUN sudo pip3 install aqtinstall==3.1.18
+RUN aqt install-qt -O ${QT_PATH} linux desktop ${QT_VERSION} linux_gcc_6 -m qtwebengine qtpositioning qtwebchannel qtwebsockets
 RUN (curl -L https://apt.kitware.com/kitware-archive.sh | sudo bash) && sudo apt-get -y install cmake
 
 RUN wget https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.287.tar.gz && \