Skip to content

Commit

Permalink
Update CI for macOS 14
Browse files Browse the repository at this point in the history
  • Loading branch information
rjanvier committed May 5, 2024
1 parent 300339e commit 27cf539
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .ci/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ channels:
dependencies:
- cgal=5.*
- ninja
- qt=5.12.*
- tbb-devel=2020.*
- qt=5.15.*
- tbb-devel=2021.*
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup (Windows)
if: matrix.config.os == 'windows-latest'
uses: actions/setup-node@v3
with:
node-version: '16'

- name: Install Dependencies
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: CCCoreLib
auto-activate-base: false
environment-file: .ci/conda.yml
miniconda-version: 'latest'
mamba-version: '*'

- name: Configure MSVC console (Windows)
if: matrix.config.os == 'windows-latest'
Expand Down Expand Up @@ -99,7 +93,7 @@ jobs:

ubuntu-build:
name: Ubuntu ${{ matrix.compiler }} SCALAR_DOUBLE=${{ matrix.scalar_double }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[skip ci]')"

strategy:
Expand All @@ -119,7 +113,7 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -qy cmake ninja-build
qt5-default qttools5-dev qttools5-dev-tools
qtbase5-dev qttools5-dev qttools5-dev-tools
libtbb-dev
libcgal-dev libcgal-qt5-dev
Expand Down

0 comments on commit 27cf539

Please sign in to comment.