AI/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ci: bump macOS requirement from 12.6 to 13.3

Browse Source 
Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2024-09-05 14:47:18 -04:00
parent 00dbc27097
commit 6e281a0307
4 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.circleci/continue_config.yml
View File

@ -75,14 +75,14 @@ jobs:
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
-S ../gpt4all-chat -B . -G Ninja \ -S ../gpt4all-chat -B . -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake/Qt6 \ -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \
-DBUILD_UNIVERSAL=ON \ -DBUILD_UNIVERSAL=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3 \
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 \ -DGGML_METAL_MACOSX_VERSION_MIN=13.3 \
-DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \ -DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \
-DGPT4ALL_OFFLINE_INSTALLER=ON \ -DGPT4ALL_OFFLINE_INSTALLER=ON \
-DGPT4ALL_SIGN_INSTALL=ON -DGPT4ALL_SIGN_INSTALL=ON
@ -216,11 +216,11 @@ jobs:
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
-S ../gpt4all-chat -B . -G Ninja \ -S ../gpt4all-chat -B . -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake/Qt6 \ -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
-DBUILD_UNIVERSAL=ON \ -DBUILD_UNIVERSAL=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3 \
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 \ -DGGML_METAL_MACOSX_VERSION_MIN=13.3 \
-DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \ -DMACDEPLOYQT=~/Qt/6.5.1/macos/bin/macdeployqt \
-DGPT4ALL_OFFLINE_INSTALLER=OFF \ -DGPT4ALL_OFFLINE_INSTALLER=OFF \
-DGPT4ALL_SIGN_INSTALL=ON -DGPT4ALL_SIGN_INSTALL=ON
@ -839,11 +839,11 @@ jobs:
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \ ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake \
-S gpt4all-chat -B build -G Ninja \ -S gpt4all-chat -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake/Qt6 \ -DCMAKE_PREFIX_PATH:PATH=~/Qt/6.5.1/macos/lib/cmake \
-DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \ -DCMAKE_MAKE_PROGRAM:FILEPATH=~/Qt/Tools/Ninja/ninja \
-DBUILD_UNIVERSAL=ON \ -DBUILD_UNIVERSAL=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3 \
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 -DGGML_METAL_MACOSX_VERSION_MIN=13.3
~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build build --target all ~/Qt/Tools/CMake/CMake.app/Contents/bin/cmake --build build --target all
build-ts-docs: build-ts-docs:
docker: docker:
@ -954,8 +954,8 @@ jobs:
cmake -B build \ cmake -B build \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_UNIVERSAL=ON \ -DBUILD_UNIVERSAL=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3 \
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 -DGGML_METAL_MACOSX_VERSION_MIN=13.3
cmake --build build --parallel cmake --build build --parallel
- run: - run:
name: Build wheel name: Build wheel
@ -1109,8 +1109,8 @@ jobs:
cmake ../.. \ cmake ../.. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_UNIVERSAL=ON \ -DBUILD_UNIVERSAL=ON \
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.6 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=13.3 \
-DGGML_METAL_MACOSX_VERSION_MIN=12.6 -DGGML_METAL_MACOSX_VERSION_MIN=13.3
cmake --build . --parallel cmake --build . --parallel
mkdir ../osx-x64 mkdir ../osx-x64
cp -L *.dylib ../osx-x64 cp -L *.dylib ../osx-x64

3
gpt4all-chat/CMakeLists.txt
View File

@ -381,6 +381,7 @@ set(CPACK_IFW_PACKAGE_WIZARD_STYLE "Aero")
set(CPACK_IFW_PACKAGE_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.png") set(CPACK_IFW_PACKAGE_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-48.png")
set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-32.png") set(CPACK_IFW_PACKAGE_WINDOW_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icons/gpt4all-32.png")
set(CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST OFF) set(CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST OFF)
set(CPACK_IFW_PACKAGE_CONTROL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/installer_control.qs")
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
include(CPack) include(CPack)
@ -393,7 +394,7 @@ endif()
cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} ESSENTIAL FORCED_INSTALLATION) cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} ESSENTIAL FORCED_INSTALLATION)
cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} VERSION ${APP_VERSION}) cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} VERSION ${APP_VERSION})
cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} LICENSES "MIT LICENSE" ${CPACK_RESOURCE_FILE_LICENSE}) cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} LICENSES "MIT LICENSE" ${CPACK_RESOURCE_FILE_LICENSE})
cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/installerscript.qs") cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/installer_component.qs")
cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} REPLACES "gpt4all-chat") #Was used in very earliest prototypes cpack_ifw_configure_component(${COMPONENT_NAME_MAIN} REPLACES "gpt4all-chat") #Was used in very earliest prototypes
if (GPT4ALL_LOCALHOST) if (GPT4ALL_LOCALHOST)

3
gpt4all-chat/cmake/installerscript.qs → gpt4all-chat/cmake/installer_component.qs
View File

@ -6,8 +6,7 @@ Component.prototype.beginInstallation = function() {
targetDirectory = installer.value("TargetDir"); targetDirectory = installer.value("TargetDir");
}; };
Component.prototype.createOperations = function() Component.prototype.createOperations = function() {
{
try { try {
// call the base create operations function // call the base create operations function
component.createOperations(); component.createOperations();

40
gpt4all-chat/cmake/installer_control.qs Normal file
View File

@ -0,0 +1,40 @@
var finishedText = null;
function cancelInstaller(message) {
installer.setDefaultPageVisible(QInstaller.Introduction, false);
installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false);
installer.setDefaultPageVisible(QInstaller.PerformInstallation, false);
installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
finishedText = message;
installer.setCanceled();
}
function vercmp(a, b) {
return a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" });
}
function Controller() {
}
Controller.prototype.TargetDirectoryPageCallback = function() {
if (
(systemInfo.productType === "macos" || systemInfo.productType === "osx")
&& vercmp(systemInfo.kernelVersion, "22.4.0") < 0
) {
cancelInstaller(
"Installation cannot continue because GPT4All does not support your operating system: " +
`Darwin ${systemInfo.kernelVersion}<br/><br/>` +
"GPT4All requires macOS Ventura 13.3 or higher."
);
}
}
Controller.prototype.FinishedPageCallback = function() {
const widget = gui.currentPageWidget();
if (widget != null && finishedText != null) {
widget.MessageLabel.setText(finishedText);
}
}