aqt installs to directory different than arch name

This commit is contained in:
Dan Paulat 2024-05-27 00:23:35 -05:00
parent 4f411ea3d8
commit 31edd9e8e5

View file

@ -29,7 +29,8 @@ jobs:
msvc_arch: x64 msvc_arch: x64
msvc_version: 2022 msvc_version: 2022
qt_version: 6.7.1 qt_version: 6.7.1
qt_arch: win64_msvc2019_64 qt_arch_aqt: win64_msvc2019_64
qt_arch_dir: msvc2019_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_arch: x86_64 conan_arch: x86_64
@ -45,7 +46,8 @@ jobs:
env_cxx: g++-11 env_cxx: g++-11
compiler: gcc compiler: gcc
qt_version: 6.7.1 qt_version: 6.7.1
qt_arch: linux_gcc_64 qt_arch_aqt: linux_gcc_64
qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_arch: x86_64 conan_arch: x86_64
@ -75,7 +77,7 @@ jobs:
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: ${{ matrix.qt_version }} version: ${{ matrix.qt_version }}
arch: ${{ matrix.qt_arch }} arch: ${{ matrix.qt_arch_aqt }}
modules: ${{ matrix.qt_modules }} modules: ${{ matrix.qt_modules }}
tools: ${{ matrix.qt_tools }} tools: ${{ matrix.qt_tools }}
@ -158,7 +160,7 @@ jobs:
mkdir -p plugins/ mkdir -p plugins/
cd plugins/ cd plugins/
mkdir -p sqldrivers/ mkdir -p sqldrivers/
cp "${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch }}/plugins/sqldrivers/libqsqlite.so" sqldrivers/ cp "${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/sqldrivers/libqsqlite.so" sqldrivers/
cd .. cd ..
popd popd
tar -czf supercell-wx-${{ matrix.artifact_suffix }}.tar.gz supercell-wx/ tar -czf supercell-wx-${{ matrix.artifact_suffix }}.tar.gz supercell-wx/