diff --git a/.ci/conda.yml b/.ci/conda.yml index c9922c3..d370d88 100644 --- a/.ci/conda.yml +++ b/.ci/conda.yml @@ -4,5 +4,5 @@ channels: dependencies: - cgal=5.* - ninja - - qt=5.12.* - - tbb-devel=2020.* + - qt=5.15.* + - tbb-devel=2021.* diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02f541f..092dfca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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' @@ -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: @@ -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