diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 686de7eb..af3ae760 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,11 +118,11 @@ jobs: - name: Install Dependencies (Ubuntu - only QT6) if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6' run: | - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_2_2-1_amd64.deb - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas-dev_2_2-1_amd64.deb - sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev - sudo dpkg -i libqt6pas6_2_2-1_amd64.deb - sudo dpkg -i libqt6pas-dev_2_2-1_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_6.2.2-2_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6-dev_6.2.2-2_amd64.deb + sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev + sudo dpkg -i libqt6pas6_6.2.2-2_amd64.deb + sudo dpkg -i libqt6pas6-dev_6.2.2-2_amd64.deb cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas qmake6 make @@ -140,7 +140,7 @@ jobs: path: | ${{ env.LAZ_DIR }} ${{ env.ASUITE_SOURCE }}/3p/mORMot2/static - key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('.cache') }} + key: ${{ runner.os }}-${{ env.cache-name }}_${{ matrix.config.build-widgetset }}-${{ hashFiles('.cache') }} - name: Install Lazarus if: steps.cache.outputs.cache-hit != 'true' && matrix.config.build-widgetset == 'qt6' diff --git a/3p/AsuiteComps b/3p/AsuiteComps index d87adccd..b5f1cd34 160000 --- a/3p/AsuiteComps +++ b/3p/AsuiteComps @@ -1 +1 @@ -Subproject commit d87adccddc90be486ccac9a8b547301c8760f511 +Subproject commit b5f1cd34c491d45db5ab80e4a1eb8bbbc863f9c2