From 5eab1457182cfc2da32c39e13c7db3d6e3b48db2 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Wed, 15 Jan 2025 16:03:31 -0500 Subject: [PATCH 1/8] update to Qt 6.8.1 Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 112 ++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 38 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 6f2ff4314ae9..44c81b38525e 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -48,10 +48,14 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-macOS-x64-4.6.0-online.dmg" - hdiutil attach qt-unified-macOS-x64-4.6.0-online.dmg - /Volumes/qt-unified-macOS-x64-4.6.0-online/qt-unified-macOS-x64-4.6.0-online.app/Contents/MacOS/qt-unified-macOS-x64-4.6.0-online --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.clang_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver - hdiutil detach /Volumes/qt-unified-macOS-x64-4.6.0-online + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" + hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ + --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ + --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Setup Keychain command: | @@ -72,14 +76,14 @@ jobs: ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ -S ../gpt4all-chat -B . -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \ + -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DBUILD_UNIVERSAL=ON \ -DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DGGML_METAL_MACOSX_VERSION_MIN=12.6 \ - -DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \ + -DMACDEPLOYQT=~/Qt/6.8.1/macos/bin/macdeployqt \ -DGPT4ALL_OFFLINE_INSTALLER=ON \ -DGPT4ALL_SIGN_INSTALL=ON ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build . --target all @@ -186,10 +190,14 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-macOS-x64-4.6.0-online.dmg" - hdiutil attach qt-unified-macOS-x64-4.6.0-online.dmg - /Volumes/qt-unified-macOS-x64-4.6.0-online/qt-unified-macOS-x64-4.6.0-online.app/Contents/MacOS/qt-unified-macOS-x64-4.6.0-online --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.clang_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver - hdiutil detach /Volumes/qt-unified-macOS-x64-4.6.0-online + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" + hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ + --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ + --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Setup Keychain command: | @@ -210,14 +218,14 @@ jobs: ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ -S ../gpt4all-chat -B . -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \ + -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DBUILD_UNIVERSAL=ON \ -DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DGGML_METAL_MACOSX_VERSION_MIN=12.6 \ - -DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \ + -DMACDEPLOYQT=~/Qt/6.8.1/macos/bin/macdeployqt \ -DGPT4ALL_OFFLINE_INSTALLER=OFF \ -DGPT4ALL_SIGN_INSTALL=ON ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build . --target all @@ -338,9 +346,13 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-linux-x64-4.6.0-online.run" - chmod +x qt-unified-linux-x64-4.6.0-online.run - ./qt-unified-linux-x64-4.6.0-online.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.gcc_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.1.run" + chmod +x qt-online-installer-linux-x64-4.8.1.run + ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ + --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build linuxdeployqt command: | @@ -351,7 +363,7 @@ jobs: no_output_timeout: 30m command: | set -eo pipefail - export CMAKE_PREFIX_PATH=~/Qt/6.5.1/gcc_64/lib/cmake + export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake export PATH=$PATH:$HOME/Qt/Tools/QtInstallerFramework/4.8/bin export PATH=$PATH:/usr/local/cuda/bin ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z @@ -416,9 +428,13 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-linux-x64-4.6.0-online.run" - chmod +x qt-unified-linux-x64-4.6.0-online.run - ./qt-unified-linux-x64-4.6.0-online.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.gcc_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.1.run" + chmod +x qt-online-installer-linux-x64-4.8.1.run + ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ + --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build linuxdeployqt command: | @@ -429,7 +445,7 @@ jobs: no_output_timeout: 30m command: | set -eo pipefail - export CMAKE_PREFIX_PATH=~/Qt/6.5.1/gcc_64/lib/cmake + export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake export PATH=$PATH:$HOME/Qt/Tools/QtInstallerFramework/4.8/bin export PATH=$PATH:/usr/local/cuda/bin ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z @@ -482,8 +498,12 @@ jobs: - run: name: Installing Qt command: | - wget.exe "https://gpt4all.io/ci/qt-unified-windows-x64-4.6.0-online.exe" - & .\qt-unified-windows-x64-4.6.0-online.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.win64_msvc2019_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK command: | @@ -524,7 +544,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S ..\gpt4all-chat -B . -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.5.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` @@ -606,8 +626,12 @@ jobs: - run: name: Installing Qt command: | - wget.exe "https://gpt4all.io/ci/qt-unified-windows-x64-4.6.0-online.exe" - & .\qt-unified-windows-x64-4.6.0-online.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.win64_msvc2019_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK command: | @@ -653,7 +677,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S ..\gpt4all-chat -B . -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.5.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` @@ -756,14 +780,18 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-linux-x64-4.6.0-online.run" - chmod +x qt-unified-linux-x64-4.6.0-online.run - ./qt-unified-linux-x64-4.6.0-online.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.gcc_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.1.run" + chmod +x qt-online-installer-linux-x64-4.8.1.run + ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ + --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build no_output_timeout: 30m command: | - export CMAKE_PREFIX_PATH=~/Qt/6.5.1/gcc_64/lib/cmake + export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake export PATH=$PATH:/usr/local/cuda/bin ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z ~/Qt/Tools/CMake/bin/cmake \ @@ -804,8 +832,12 @@ jobs: - run: name: Installing Qt command: | - wget.exe "https://gpt4all.io/ci/qt-unified-windows-x64-4.6.0-online.exe" - & .\qt-unified-windows-x64-4.6.0-online.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.win64_msvc2019_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver + wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK command: | @@ -830,7 +862,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S gpt4all-chat -B build -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.5.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` @@ -866,10 +898,14 @@ jobs: - run: name: Installing Qt command: | - wget "https://gpt4all.io/ci/qt-unified-macOS-x64-4.6.0-online.dmg" - hdiutil attach qt-unified-macOS-x64-4.6.0-online.dmg - /Volumes/qt-unified-macOS-x64-4.6.0-online/qt-unified-macOS-x64-4.6.0-online.app/Contents/MacOS/qt-unified-macOS-x64-4.6.0-online --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.651.clang_64 qt.qt6.651.qt5compat qt.qt6.651.debug_info qt.qt6.651.addons.qtpdf qt.qt6.651.addons.qthttpserver - hdiutil detach /Volumes/qt-unified-macOS-x64-4.6.0-online + wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" + hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ + --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ + --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ + qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Build no_output_timeout: 30m @@ -878,7 +914,7 @@ jobs: ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ -S gpt4all-chat -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \ + -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ From 3189ff499363182f8e311049181a3df85f04375c Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Wed, 15 Jan 2025 16:07:50 -0500 Subject: [PATCH 2/8] changelog: add this PR Signed-off-by: Jared Van Bortel --- gpt4all-chat/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gpt4all-chat/CHANGELOG.md b/gpt4all-chat/CHANGELOG.md index 0703907655e5..77332a09d991 100644 --- a/gpt4all-chat/CHANGELOG.md +++ b/gpt4all-chat/CHANGELOG.md @@ -6,7 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## [Unreleased] -## Fixed +### Changed +- Update from Qt 6.5.1 to 6.8.1 ([#3386](https://github.com/nomic-ai/gpt4all/pull/3386)) + +### Fixed - Fix the timeout error in code interpreter ([#3369](https://github.com/nomic-ai/gpt4all/pull/3369)) - Fix code interpreter console.log not accepting multiple arguments ([#3371](https://github.com/nomic-ai/gpt4all/pull/3371)) - Remove 'X is defined' checks from templates as they work incorrectly with Jinja2Cpp ([#3372](https://github.com/nomic-ai/gpt4all/pull/3372)) From 683fac7febe623430139524e7e8e2db7a0c1c860 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Wed, 15 Jan 2025 16:11:15 -0500 Subject: [PATCH 3/8] fix typos Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 44c81b38525e..5003e92b5fe3 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -49,7 +49,7 @@ jobs: name: Installing Qt command: | wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" - hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ @@ -191,7 +191,7 @@ jobs: name: Installing Qt command: | wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" - hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ @@ -899,7 +899,7 @@ jobs: name: Installing Qt command: | wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" - hdiutil attachqt-online-installer-macOS-x64-4.8.1.dmg + hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ From 16beab74de30d922770bcbb64e935a0078ff8f5b Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Thu, 16 Jan 2025 12:04:23 -0500 Subject: [PATCH 4/8] ci: fix line continuation Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 5003e92b5fe3..09bdad144fd8 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -499,10 +499,10 @@ jobs: name: Installing Qt command: | wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" - & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ - --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ - --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -627,10 +627,10 @@ jobs: name: Installing Qt command: | wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" - & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ - --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ - --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -833,10 +833,10 @@ jobs: name: Installing Qt command: | wget.exe "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.1.exe" - & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ^ - --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ - --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ^ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ^ + & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` + --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK From 375447bb7a333128505d217c47737fe7209ae432 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Thu, 16 Jan 2025 12:08:54 -0500 Subject: [PATCH 5/8] ci: fix Qt 6.8.1 package names - macOS has no debug_info anymore - qt5compat is now addons.qt5compat - gcc_64 is now linux_gcc_64 Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 39 +++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 09bdad144fd8..d665f9f2ddc0 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -51,10 +51,11 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ - --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ - qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + --no-force-installations --no-default-installations --no-size-checking --default-answer + --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ + install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ + extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Setup Keychain @@ -193,10 +194,11 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ - --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ - qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + --no-force-installations --no-default-installations --no-size-checking --default-answer + --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ + install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ + extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Setup Keychain @@ -351,7 +353,7 @@ jobs: ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \ qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build linuxdeployqt @@ -433,7 +435,7 @@ jobs: ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \ qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build linuxdeployqt @@ -502,7 +504,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -630,7 +632,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -785,7 +787,7 @@ jobs: ./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \ --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.gcc_64 qt.qt6.681.qt5compat \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \ qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Build @@ -836,7 +838,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -901,10 +903,11 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses \ - --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" install \ - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.qt5compat \ - qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + --no-force-installations --no-default-installations --no-size-checking --default-answer + --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ + install \ + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ + extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1 - run: name: Build From b9de757882bb6c6f705198745fae5475cd36bbe6 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Thu, 16 Jan 2025 12:21:23 -0500 Subject: [PATCH 6/8] ci: fix name of Windows MSVC package Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index d665f9f2ddc0..ba7c74874c78 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -504,7 +504,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -546,7 +546,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S ..\gpt4all-chat -B . -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` @@ -632,7 +632,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -679,7 +679,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S ..\gpt4all-chat -B . -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` @@ -838,7 +838,7 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2019_64 qt.qt6.681.addons.qt5compat ` + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat ` qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver - run: name: Install VulkanSDK @@ -864,7 +864,7 @@ jobs: & "C:\Qt\Tools\CMake_64\bin\cmake.exe" ` -S gpt4all-chat -B build -G Ninja ` -DCMAKE_BUILD_TYPE=Release ` - "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2019_64" ` + "-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" ` "-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` From 1e53f595248b0c2012fe89e95426c68263d04eb1 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Thu, 16 Jan 2025 12:45:45 -0500 Subject: [PATCH 7/8] ci: fix missing line continuations Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index ba7c74874c78..ab01a785d987 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -51,7 +51,7 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer + --no-force-installations --no-default-installations --no-size-checking --default-answer \ --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ install \ qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ @@ -194,7 +194,7 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer + --no-force-installations --no-default-installations --no-size-checking --default-answer \ --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ install \ qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ @@ -903,7 +903,7 @@ jobs: wget "https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.1.dmg" hdiutil attach qt-online-installer-macOS-x64-4.8.1.dmg /Volumes/qt-online-installer-macOS-x64-4.8.1/qt-online-installer-macOS-x64-4.8.1.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.1 \ - --no-force-installations --no-default-installations --no-size-checking --default-answer + --no-force-installations --no-default-installations --no-size-checking --default-answer \ --accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \ install \ qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \ From d40fe2a9869d1b8f2f7fd5f2c8ebc72442cc96ba Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Tue, 21 Jan 2025 16:03:16 -0500 Subject: [PATCH 8/8] fix deps and windeployqt Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index ec2e07379c69..7aed474bfaad 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -775,8 +775,9 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_arm64_cross_compiled ` - qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 ` + qt.qt6.681.win64_msvc2022_arm64_cross_compiled qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info ` + qt.qt6.681.addons.qthttpserver - run: name: "Install Dotnet 8" command: | @@ -813,6 +814,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` -DLLMODEL_CUDA=OFF ` -DLLMODEL_KOMPUTE=OFF ` + "-DWINDEPLOYQT=C:\Qt\6.8.1\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.1\msvc2022_arm64\bin\qtpaths.bat" ` -DGPT4ALL_TEST=OFF ` -DGPT4ALL_OFFLINE_INSTALLER=ON & "C:\Qt\Tools\Ninja\ninja.exe" @@ -894,8 +896,9 @@ jobs: & .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations ` --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ` --email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install ` - qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_arm64_cross_compiled ` - qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver + qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 ` + qt.qt6.681.win64_msvc2022_arm64_cross_compiled qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info ` + qt.qt6.681.addons.qthttpserver - run: name: "Install Dotnet 8" command: | @@ -937,6 +940,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` -DLLMODEL_CUDA=OFF ` -DLLMODEL_KOMPUTE=OFF ` + "-DWINDEPLOYQT=C:\Qt\6.8.1\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.1\msvc2022_arm64\bin\qtpaths.bat" ` -DGPT4ALL_TEST=OFF ` -DGPT4ALL_OFFLINE_INSTALLER=OFF & "C:\Qt\Tools\Ninja\ninja.exe"