diff --git a/.appveyor.yml b/.appveyor.yml index 4915c710c..7e9aa6cd7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,7 +19,8 @@ clone_script: && git submodule update --init --recursive environment: - APPVEYOR_SAVE_CACHE_ON_ERROR : true + APPVEYOR_SAVE_CACHE_ON_ERROR : false + APPVEYOR_CACHE_SKIP_RESTORE : true VCPKG_DEFAULT_TRIPLET: x64-windows VCPKG_ROOT: c:\tools\vcpkg diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 0d7e37af9..61c75aefa 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -43,34 +43,24 @@ reviews: github-checks: enabled: true timeout_ms: 90000 + gitleaks: + enabled: true + cppcheck: + enabled: true languagetool: enabled: true enabled_only: false level: default - biome: - enabled: true hadolint: enabled: true yamllint: enabled: true - gitleaks: - enabled: true - checkov: - enabled: true - buf: - enabled: true - regal: - enabled: true actionlint: enabled: true pmd: enabled: true - cppcheck: - enabled: true semgrep: enabled: true - circleci: - enabled: true chat: auto_reply: true knowledge_base: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8deafba94..140a60b11 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,21 +18,11 @@ jobs: - name: Setup run: | - rm /usr/local/bin/2to3 - rm /usr/local/bin/2to3-3.11 - rm /usr/local/bin/2to3-3.12 - rm /usr/local/bin/idle3 - rm /usr/local/bin/idle3.11 - rm /usr/local/bin/idle3.12 - rm /usr/local/bin/pydoc3 - rm /usr/local/bin/pydoc3.11 - rm /usr/local/bin/pydoc3.12 - rm /usr/local/bin/python3 - rm /usr/local/bin/python3.11 - rm /usr/local/bin/python3.12 - rm /usr/local/bin/python3-config - rm /usr/local/bin/python3.11-config - rm /usr/local/bin/python3.12-config + # Remove Python symlinks if they exist + for file in \ + /usr/local/bin/{2to3,idle3,pydoc3,python3,python3-config}{,-3.11,-3.12}; do + [ -L "$file" ] && sudo rm "$file" || true + done brew install automake autoconf autoconf-archive libtool texinfo yasm ninja python ccache pkg-config - name: Restore artifacts or setup vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index f76b2fb74..42d290024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16...3.26) +cmake_minimum_required(VERSION 3.16) # vcpkg settings must be set before project() if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) @@ -67,6 +67,11 @@ include(CMakeDependentOption) # Set CGAL_DATA_DIR to the location of the CGAL data files set(ENV{CGAL_DATA_DIR} CMAKE_BINARY_DIR/Data) +# Minimum compiler versions required for C++23 support: +# - MSVC 19.34 (Visual Studio 2022 version 17.4) +# - GCC 12.2 +# - AppleClang 14.0 +# - Clang 16.0 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.34") message(FATAL_ERROR "MSVC 19.34 or higher required for C++23 support") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.2") @@ -86,7 +91,6 @@ endif() # Project vcpkg dependencies # https://github.com/CGAL/cgal -#find_package(CGAL CONFIG REQUIRED OPTIONAL_COMPONENTS Qt5) find_package(CGAL CONFIG REQUIRED) # Don't let CGAL override flags set(CGAL_DONT_OVERRIDE_CMAKE_FLAGS