From 8518a1efa6b6c31d0a74ba166c4b6ed785c3ac5b Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Thu, 12 Sep 2024 23:23:09 -0500 Subject: [PATCH] ci: Add cgal install to CI * Use package managers to install libcgal-dev (Linux) and cgal (macOS) in CI jobs. --- .cirrus.yml | 1 + .github/workflows/ci.yml | 8 +++++--- .github/workflows/wheels.yml | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1b680ba..56ec5ce 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,6 +20,7 @@ task: gcc \ g++ \ libboost-dev \ + libcgal-dev \ libmpfr-dev \ libgmp-dev \ swig \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 488c359..3de1ae2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,12 +48,14 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig gmp mpfr boost + brew install make automake swig gmp mpfr boost cgal export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - name: Install extra deps on Linux if: runner.os == 'Linux' - run: sudo apt-get update && sudo apt-get install -y libboost-dev libmpfr-dev swig autoconf libtool + run: | + sudo apt-get update + sudo apt-get install -y libboost-dev libcgal-dev libmpfr-dev swig autoconf libtool - name: Install package run: | @@ -86,7 +88,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig mpfr boost + brew install make automake swig mpfr boost cgal export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - name: Clone gmp diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ece5d47..ad1699e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -62,7 +62,7 @@ jobs: - name: Install compiler tools on macOS if: runner.os == 'macOS' run: | - brew install make automake swig mpfr boost + brew install make automake swig mpfr boost cgal export PATH="/usr/local/opt/make/libexec/gnubin:$PATH" - name: Clone gmp @@ -112,7 +112,9 @@ jobs: - name: Install extra deps on Linux if: runner.os == 'Linux' - run: sudo apt-get update && sudo apt-get install -y libboost-dev swig autoconf libtool + run: | + sudo apt-get update + sudo apt-get install -y libboost-dev libcgal-dev swig autoconf libtool - name: test sdist run: python -m pip install dist/*.tar.gz