Skip to content

Commit 5af3127

Browse files
cebtenzzrecebtenzzre
authored
ci: update to Qt 6.8.2 (#3442)
Signed-off-by: Jared Van Bortel <[email protected]>
1 parent a80f023 commit 5af3127

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎.circleci/continue_config.yml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
--no-force-installations --no-default-installations --no-size-checking --default-answer \
6262
--accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \
6363
install \
64-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \
65-
extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
64+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.clang_64 qt.qt6.682.addons.qt5compat \
65+
extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
6666
hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1
6767
- run:
6868
name: Setup Keychain
@@ -84,14 +84,14 @@ jobs:
8484
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
8585
-S ../gpt4all-chat -B . -G Ninja \
8686
-DCMAKE_BUILD_TYPE=Release \
87-
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \
87+
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.2/macos/lib/cmake \
8888
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
8989
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
9090
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
9191
-DBUILD_UNIVERSAL=ON \
9292
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \
9393
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 \
94-
-DMACDEPLOYQT=~/Qt/6.8.1/macos/bin/macdeployqt \
94+
-DMACDEPLOYQT=~/Qt/6.8.2/macos/bin/macdeployqt \
9595
-DGPT4ALL_OFFLINE_INSTALLER=ON \
9696
-DGPT4ALL_SIGN_INSTALL=ON \
9797
-DGPT4ALL_GEN_CPACK_CONFIG=ON
@@ -230,8 +230,8 @@ jobs:
230230
--no-force-installations --no-default-installations --no-size-checking --default-answer \
231231
--accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \
232232
install \
233-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \
234-
extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
233+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.clang_64 qt.qt6.682.addons.qt5compat \
234+
extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
235235
hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1
236236
- run:
237237
name: Setup Keychain
@@ -253,14 +253,14 @@ jobs:
253253
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
254254
-S ../gpt4all-chat -B . -G Ninja \
255255
-DCMAKE_BUILD_TYPE=Release \
256-
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \
256+
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.2/macos/lib/cmake \
257257
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
258258
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
259259
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
260260
-DBUILD_UNIVERSAL=ON \
261261
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \
262262
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 \
263-
-DMACDEPLOYQT=~/Qt/6.8.1/macos/bin/macdeployqt \
263+
-DMACDEPLOYQT=~/Qt/6.8.2/macos/bin/macdeployqt \
264264
-DGPT4ALL_OFFLINE_INSTALLER=OFF \
265265
-DGPT4ALL_SIGN_INSTALL=ON \
266266
-DGPT4ALL_GEN_CPACK_CONFIG=ON
@@ -405,8 +405,8 @@ jobs:
405405
./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \
406406
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \
407407
--email "$QT_EMAIL" --password "$QT_PASSWORD" install \
408-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \
409-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
408+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.linux_gcc_64 qt.qt6.682.addons.qt5compat \
409+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
410410
- run:
411411
name: Build linuxdeployqt
412412
command: |
@@ -417,7 +417,7 @@ jobs:
417417
no_output_timeout: 30m
418418
command: |
419419
set -eo pipefail
420-
export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake
420+
export CMAKE_PREFIX_PATH=~/Qt/6.8.2/gcc_64/lib/cmake
421421
export PATH=$PATH:$HOME/Qt/Tools/QtInstallerFramework/4.8/bin
422422
export PATH=$PATH:/usr/local/cuda/bin
423423
ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z
@@ -494,8 +494,8 @@ jobs:
494494
./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \
495495
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \
496496
--email "$QT_EMAIL" --password "$QT_PASSWORD" install \
497-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \
498-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
497+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.linux_gcc_64 qt.qt6.682.addons.qt5compat \
498+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
499499
- run:
500500
name: Build linuxdeployqt
501501
command: |
@@ -506,7 +506,7 @@ jobs:
506506
no_output_timeout: 30m
507507
command: |
508508
set -eo pipefail
509-
export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake
509+
export CMAKE_PREFIX_PATH=~/Qt/6.8.2/gcc_64/lib/cmake
510510
export PATH=$PATH:$HOME/Qt/Tools/QtInstallerFramework/4.8/bin
511511
export PATH=$PATH:/usr/local/cuda/bin
512512
ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z
@@ -571,8 +571,8 @@ jobs:
571571
& .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations `
572572
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations `
573573
--email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install `
574-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat `
575-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
574+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.win64_msvc2022_64 qt.qt6.682.addons.qt5compat `
575+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
576576
- run:
577577
name: Install VulkanSDK
578578
command: |
@@ -613,7 +613,7 @@ jobs:
613613
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
614614
-S ..\gpt4all-chat -B . -G Ninja `
615615
-DCMAKE_BUILD_TYPE=Release `
616-
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" `
616+
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.2\msvc2022_64" `
617617
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
618618
-DCMAKE_C_COMPILER_LAUNCHER=ccache `
619619
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache `
@@ -705,8 +705,8 @@ jobs:
705705
& .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations `
706706
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations `
707707
--email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install `
708-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat `
709-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
708+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.win64_msvc2022_64 qt.qt6.682.addons.qt5compat `
709+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
710710
- run:
711711
name: Install VulkanSDK
712712
command: |
@@ -752,7 +752,7 @@ jobs:
752752
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
753753
-S ..\gpt4all-chat -B . -G Ninja `
754754
-DCMAKE_BUILD_TYPE=Release `
755-
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" `
755+
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.2\msvc2022_64" `
756756
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
757757
-DCMAKE_C_COMPILER_LAUNCHER=ccache `
758758
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache `
@@ -853,9 +853,9 @@ jobs:
853853
& .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations `
854854
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations `
855855
--email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install `
856-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 `
857-
qt.qt6.681.win64_msvc2022_arm64_cross_compiled qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info `
858-
qt.qt6.681.addons.qthttpserver
856+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.win64_msvc2022_64 `
857+
qt.qt6.682.win64_msvc2022_arm64_cross_compiled qt.qt6.682.addons.qt5compat qt.qt6.682.debug_info `
858+
qt.qt6.682.addons.qthttpserver
859859
- run:
860860
name: "Install Dotnet 8"
861861
command: |
@@ -885,14 +885,14 @@ jobs:
885885
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
886886
-S ..\gpt4all-chat -B . -G Ninja `
887887
-DCMAKE_BUILD_TYPE=Release `
888-
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_arm64" `
888+
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.2\msvc2022_arm64" `
889889
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
890-
"-DCMAKE_TOOLCHAIN_FILE=C:\Qt\6.8.1\msvc2022_arm64\lib\cmake\Qt6\qt.toolchain.cmake" `
890+
"-DCMAKE_TOOLCHAIN_FILE=C:\Qt\6.8.2\msvc2022_arm64\lib\cmake\Qt6\qt.toolchain.cmake" `
891891
-DCMAKE_C_COMPILER_LAUNCHER=ccache `
892892
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache `
893893
-DLLMODEL_CUDA=OFF `
894894
-DLLMODEL_KOMPUTE=OFF `
895-
"-DWINDEPLOYQT=C:\Qt\6.8.1\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.1\msvc2022_arm64\bin\qtpaths.bat" `
895+
"-DWINDEPLOYQT=C:\Qt\6.8.2\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.2\msvc2022_arm64\bin\qtpaths.bat" `
896896
-DGPT4ALL_TEST=OFF `
897897
-DGPT4ALL_OFFLINE_INSTALLER=ON
898898
& "C:\Qt\Tools\Ninja\ninja.exe"
@@ -980,9 +980,9 @@ jobs:
980980
& .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations `
981981
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations `
982982
--email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install `
983-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 `
984-
qt.qt6.681.win64_msvc2022_arm64_cross_compiled qt.qt6.681.addons.qt5compat qt.qt6.681.debug_info `
985-
qt.qt6.681.addons.qthttpserver
983+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.win64_msvc2022_64 `
984+
qt.qt6.682.win64_msvc2022_arm64_cross_compiled qt.qt6.682.addons.qt5compat qt.qt6.682.debug_info `
985+
qt.qt6.682.addons.qthttpserver
986986
- run:
987987
name: "Install Dotnet 8"
988988
command: |
@@ -1017,14 +1017,14 @@ jobs:
10171017
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
10181018
-S ..\gpt4all-chat -B . -G Ninja `
10191019
-DCMAKE_BUILD_TYPE=Release `
1020-
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_arm64" `
1020+
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.2\msvc2022_arm64" `
10211021
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
1022-
"-DCMAKE_TOOLCHAIN_FILE=C:\Qt\6.8.1\msvc2022_arm64\lib\cmake\Qt6\qt.toolchain.cmake" `
1022+
"-DCMAKE_TOOLCHAIN_FILE=C:\Qt\6.8.2\msvc2022_arm64\lib\cmake\Qt6\qt.toolchain.cmake" `
10231023
-DCMAKE_C_COMPILER_LAUNCHER=ccache `
10241024
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache `
10251025
-DLLMODEL_CUDA=OFF `
10261026
-DLLMODEL_KOMPUTE=OFF `
1027-
"-DWINDEPLOYQT=C:\Qt\6.8.1\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.1\msvc2022_arm64\bin\qtpaths.bat" `
1027+
"-DWINDEPLOYQT=C:\Qt\6.8.2\msvc2022_64\bin\windeployqt.exe;--qtpaths;C:\Qt\6.8.2\msvc2022_arm64\bin\qtpaths.bat" `
10281028
-DGPT4ALL_TEST=OFF `
10291029
-DGPT4ALL_OFFLINE_INSTALLER=OFF
10301030
& "C:\Qt\Tools\Ninja\ninja.exe"
@@ -1135,13 +1135,13 @@ jobs:
11351135
./qt-online-installer-linux-x64-4.8.1.run --no-force-installations --no-default-installations \
11361136
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \
11371137
--email "$QT_EMAIL" --password "$QT_PASSWORD" install \
1138-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qt5compat \
1139-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
1138+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.linux_gcc_64 qt.qt6.682.addons.qt5compat \
1139+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
11401140
- run:
11411141
name: Build
11421142
no_output_timeout: 30m
11431143
command: |
1144-
export CMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64/lib/cmake
1144+
export CMAKE_PREFIX_PATH=~/Qt/6.8.2/gcc_64/lib/cmake
11451145
export PATH=$PATH:/usr/local/cuda/bin
11461146
ccache -o "cache_dir=${PWD}/../.ccache" -o max_size=500M -p -z
11471147
~/Qt/Tools/CMake/bin/cmake \
@@ -1186,8 +1186,8 @@ jobs:
11861186
& .\qt-online-installer-windows-x64-4.8.1.exe --no-force-installations --no-default-installations `
11871187
--no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations `
11881188
--email "${Env:QT_EMAIL}" --password "${Env:QT_PASSWORD}" install `
1189-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.win64_msvc2022_64 qt.qt6.681.addons.qt5compat `
1190-
qt.qt6.681.debug_info extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
1189+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.win64_msvc2022_64 qt.qt6.682.addons.qt5compat `
1190+
qt.qt6.682.debug_info extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
11911191
- run:
11921192
name: Install VulkanSDK
11931193
command: |
@@ -1212,7 +1212,7 @@ jobs:
12121212
& "C:\Qt\Tools\CMake_64\bin\cmake.exe" `
12131213
-S gpt4all-chat -B build -G Ninja `
12141214
-DCMAKE_BUILD_TYPE=Release `
1215-
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.1\msvc2022_64" `
1215+
"-DCMAKE_PREFIX_PATH:PATH=C:\Qt\6.8.2\msvc2022_64" `
12161216
"-DCMAKE_MAKE_PROGRAM:FILEPATH=C:\Qt\Tools\Ninja\ninja.exe" `
12171217
-DCMAKE_C_COMPILER_LAUNCHER=ccache `
12181218
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache `
@@ -1254,8 +1254,8 @@ jobs:
12541254
--no-force-installations --no-default-installations --no-size-checking --default-answer \
12551255
--accept-licenses --confirm-command --accept-obligations --email "$QT_EMAIL" --password "$QT_PASSWORD" \
12561256
install \
1257-
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.681.clang_64 qt.qt6.681.addons.qt5compat \
1258-
extensions.qtpdf.681 qt.qt6.681.addons.qthttpserver
1257+
qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.682.clang_64 qt.qt6.682.addons.qt5compat \
1258+
extensions.qtpdf.682 qt.qt6.682.addons.qthttpserver
12591259
hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.1
12601260
- run:
12611261
name: Build
@@ -1265,7 +1265,7 @@ jobs:
12651265
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
12661266
-S gpt4all-chat -B build -G Ninja \
12671267
-DCMAKE_BUILD_TYPE=Release \
1268-
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.1/macos/lib/cmake \
1268+
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.8.2/macos/lib/cmake \
12691269
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
12701270
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
12711271
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \

‎gpt4all-chat/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ include(../common/common.cmake)
44

55
set(APP_VERSION_MAJOR 3)
66
set(APP_VERSION_MINOR 8)
7-
set(APP_VERSION_PATCH 0)
7+
set(APP_VERSION_PATCH 1)
88
set(APP_VERSION_BASE "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
9-
set(APP_VERSION "${APP_VERSION_BASE}")
9+
set(APP_VERSION "${APP_VERSION_BASE}-dev0")
1010

1111
project(gpt4all VERSION ${APP_VERSION_BASE} LANGUAGES CXX C)
1212

0 commit comments

Comments
 (0)