fix build

rectalogic · Jan 19, 2024 · fa76464 · fa76464
1 parent 3d4b08b
commit fa76464
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
       id: restore-cache
       with:
         path: build/Darwin/installed
-        key: ${{ runner.os }}-${{ hashFiles('builders/versions') }}-${{ env.XCODE_VER }}
+        key: ${{ runner.os }}-${{ hashFiles('builders/versions') }}-${{ hashFiles('builders/Darwin/install-qt6.sh') }}-${{ hashFiles('builders/aqtinstall-requirements.txt') }}-${{ env.XCODE_VER }}
     - name: Build installation
       if: steps.restore-cache.outputs.cache-hit != 'true'
       run: |

diff --git a/builders/Linux/Dockerfile b/builders/Linux/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get -y update \
 
 COPY aqtinstall-requirements.txt /tmp/aqtinstall-requirements.txt
 RUN pip3 install --requirement /tmp/aqtinstall-requirements.txt \
-    && python3 -m aqt install-qt linux desktop ${QT_VER} --modules qtmultimedia qtquick3d qtshadertools qtquicktimeline debug_info --archives qtbase qtdeclarative qtmultimedia qtquick3d qtquicktimeline --outputdir /usr/local/Qt \
+    && python3 -m aqt install-qt linux desktop ${QT_VER} --modules qtmultimedia qtquick3d qtshadertools qtquicktimeline debug_info --archives qtbase qttools qtdeclarative qtmultimedia qtquick3d qtquicktimeline --outputdir /usr/local/Qt \
     && python3 -m aqt install-doc linux ${QT_VER} --modules qtmultimedia --archives qtquick qtmultimedia --outputdir /usr/local/Qt \
     && find /usr/local/Qt/Docs/Qt-${QT_VER} -type f -and -not -name '*.index' -delete