Merge branch 'swig-4.1.1'

CGAL · Jan 25, 2024 · 7d97128 · 7d97128
2 parents d0ed7a5 + 758c97e
commit 7d97128
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -159,6 +159,10 @@ jobs:
               cp wheelhouse/*.whl .
               ;;
             macOS)
+              brew install oras
+              brew uninstall swig
+              oras pull ghcr.io/homebrew/core/swig:4.1.1@sha256:8028a96224cd79b3f7e5fb67195cce44b25698c459853a24f3fa511517701cb8
+              brew install ./swig--4.1.1.monterey.bottle.tar.gz
               LDFLAGS="-rpath ${CONDA_ENV_DIR}/lib -rpath $HOME/.local/lib"
               export LDFLAGS
               CXXFLAGS=-faligned-allocation
@@ -169,6 +173,8 @@ jobs:
               cp fixed_wheel/*.whl .
               ;;
             Windows)
+              choco uninstall swig
+              choco install --version 4.1.1 swig
               LIB=${CONDA_ENV_DIR}\\lib
               CGAL_DIR=$HOME/.local
               CXXFLAGS=-D__TBB_NO_IMPLICIT_LINKAGE

diff --git a/.integration/conda-env-test.yml b/.integration/conda-env-test.yml
@@ -12,7 +12,7 @@ dependencies:
   - twine
   - delocate
   - pycodestyle
-  - swig
+  - swig<4.2
   - tbb
   - tbb-devel
   - wheel