From de30eeaa66633404535ee7305ddc90c225efbf4f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 13 Jul 2024 13:53:43 -0500 Subject: [PATCH] Fix CI build errors --- appveyor.yml | 4 ++-- scripts/appveyor/qmake.bat | 2 +- scripts/appveyor/qtpaths.bat | 2 +- scripts/appveyor/target_qt.conf | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a6254528..25b32d43 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ environment: QTDIR: C:\Qt\6.7 - APPVEYOR_BUILD_WORKER_IMAGE: macOS-Sonoma BUILD_TARGET: macos - QTDIR: $HOME/Qt/6.6 + QTDIR: Qt/6.6 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604 BUILD_TARGET: steamlink - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 @@ -53,7 +53,7 @@ build_script: - cmd: 'scripts\generate-bundle.bat Release' - sh: '[ "$BUILD_TARGET" != linux ] || source /opt/qt515/bin/qt515-env.sh' - sh: '[ "$BUILD_TARGET" != linux ] || PATH=$PATH:$HOME/bin scripts/build-appimage.sh' - - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$QTDIR/macos/bin scripts/generate-dmg.sh Release' + - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$HOME/$QTDIR/macos/bin scripts/generate-dmg.sh Release' - sh: '[ "$BUILD_TARGET" != steamlink ] || STEAMLINK_SDK_PATH=$HOME/steamlink-sdk scripts/build-steamlink-app.sh' after_build: diff --git a/scripts/appveyor/qmake.bat b/scripts/appveyor/qmake.bat index cfe702bc..a301728b 100644 --- a/scripts/appveyor/qmake.bat +++ b/scripts/appveyor/qmake.bat @@ -1,2 +1,2 @@ @echo off -%QTDIR_ARM64%\msvc2019_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %* +%QTDIR%\msvc2019_64\bin\qmake.exe -qtconf "%~dp0\target_qt.conf" %* diff --git a/scripts/appveyor/qtpaths.bat b/scripts/appveyor/qtpaths.bat index 52e639df..b6ab7c24 100644 --- a/scripts/appveyor/qtpaths.bat +++ b/scripts/appveyor/qtpaths.bat @@ -1,2 +1,2 @@ @echo off -%QTDIR_ARM64%\msvc2019_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %* +%QTDIR%\msvc2019_64\bin\qtpaths.exe -qtconf "%~dp0\target_qt.conf" %* diff --git a/scripts/appveyor/target_qt.conf b/scripts/appveyor/target_qt.conf index cd09ec1e..b8435a0c 100644 --- a/scripts/appveyor/target_qt.conf +++ b/scripts/appveyor/target_qt.conf @@ -1,5 +1,5 @@ [DevicePaths] -Prefix=C:/Qt/Qt-6.5 +Prefix=C:/Qt/Qt-6.7 [Paths] Prefix=../ Documentation=./doc @@ -24,5 +24,5 @@ Sysroot= SysrootifyPrefix=false TargetSpec=win32-arm64-msvc HostSpec= -Documentation=../../Docs/Qt-6.5 -Examples=../../Examples/Qt-6.5 \ No newline at end of file +Documentation=../../Docs/Qt-6.7 +Examples=../../Examples/Qt-6.7 \ No newline at end of file