Skip to content

Commit

Permalink
ci: Fix workflows mostly
Browse files Browse the repository at this point in the history
Note we also updated vcpkg
  • Loading branch information
acgetchell committed Nov 2, 2024
1 parent d1c5ff9 commit 41fedd6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 32 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 4 additions & 14 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 5 additions & 15 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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")
Expand All @@ -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
Expand Down

0 comments on commit 41fedd6

Please sign in to comment.