From f50e6cc94b88e5bae5ecdb866ae6f7ec865dbb45 Mon Sep 17 00:00:00 2001 From: Algiane Froehly Date: Thu, 17 Oct 2024 14:21:24 +0200 Subject: [PATCH 1/3] TO REVERT: enable only macos jobs with VTK install. --- .github/workflows/main-job.yml | 196 ++++++++++++++++----------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/.github/workflows/main-job.yml b/.github/workflows/main-job.yml index fb119d8b6..7802eea54 100644 --- a/.github/workflows/main-job.yml +++ b/.github/workflows/main-job.yml @@ -33,118 +33,118 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04,macos-12] - pattern: [on,off] + os: [macos-12] + pattern: [off] pointmap: [off] - scotch: [on,off] - vtk: [off] + scotch: [off] + vtk: [on] int: [int32_t] - include: + #include: # test vtk only without scotch and with delaunay insertion (more # tests are useless) - - os: ubuntu-20.04 - pattern: off - pointmap: off - scotch: off - vtk: on - int: int32_t - - - os: macos-12 - pattern: off - pointmap: off - scotch: off - vtk: on - int: int32_t + #- os: ubuntu-20.04 + # pattern: off + # pointmap: off + # scotch: off + # vtk: on + # int: int32_t + + #- os: macos-12 + # pattern: off + # pointmap: off + # scotch: off + # vtk: on + # int: int32_t # Test pointmap with scotch except on windows - - os: ubuntu-20.04 - pattern: off - pointmap: on - scotch: on - vtk: off - int: int32_t - - - os: macos-12 - pattern: off - pointmap: on - scotch: on - vtk: off - int: int32_t + #- os: ubuntu-20.04 + # pattern: off + # pointmap: on + # scotch: on + # vtk: off + # int: int32_t + + #- os: macos-12 + # pattern: off + # pointmap: on + # scotch: on + # vtk: off + # int: int32_t # Add windows basic test (matrix is not testable as dependencies # don't build with MSVC) - - os: windows-2022 - pattern: off - pointmap: off - scotch: off - vtk: off - int: int32_t - - - os: windows-2022 - pattern: on - pointmap: off - scotch: off - vtk: off - int: int32_t + #- os: windows-2022 + # pattern: off + # pointmap: off + # scotch: off + # vtk: off + # int: int32_t + + #- os: windows-2022 + # pattern: on + # pointmap: off + # scotch: off + # vtk: off + # int: int32_t # Add test for pointmap only if pattern off - - os: windows-2022 - pattern: off - pointmap: on - scotch: off - vtk: off - int: int32_t + #- os: windows-2022 + # pattern: off + # pointmap: on + # scotch: off + # vtk: off + # int: int32_t # Test int64_t build on all archi, and try to cover all code - - os: ubuntu-20.04 - pattern: on - pointmap: on - scotch: on - vtk: on - int: int64_t - - - os: ubuntu-20.04 - pattern: off - pointmap: off - scotch: on - vtk: on - int: int64_t - - - os: ubuntu-20.04 - pattern: off - pointmap: off - scotch: off - vtk: off - int: int64_t - - - os: macos-12 - pattern: on - pointmap: on - scotch: on - vtk: on - int: int64_t - - - os: macos-12 - pattern: off - pointmap: off - scotch: off - vtk: off - int: int64_t - - - os: windows-2022 - pattern: on - pointmap: on - scotch: off - vtk: off - int: int64_t - - - os: windows-2022 - pattern: off - pointmap: off - scotch: off - vtk: off - int: int64_t + #- os: ubuntu-20.04 + # pattern: on + # pointmap: on + # scotch: on + # vtk: on + # int: int64_t + # + #- os: ubuntu-20.04 + # pattern: off + # pointmap: off + # scotch: on + # vtk: on + # int: int64_t + # + #- os: ubuntu-20.04 + # pattern: off + # pointmap: off + # scotch: off + # vtk: off + # int: int64_t + # + #- os: macos-12 + # pattern: on + # pointmap: on + # scotch: on + # vtk: on + # int: int64_t + # + #- os: macos-12 + # pattern: off + # pointmap: off + # scotch: off + # vtk: off + # int: int64_t + # + #- os: windows-2022 + # pattern: on + # pointmap: on + # scotch: off + # vtk: off + # int: int64_t + # + #- os: windows-2022 + # pattern: off + # pointmap: off + # scotch: off + # vtk: off + # int: int64_t steps: - name: Set cmake_build_type and export coverage flags From 649c9995b20c8481e3243fa19c9c8c5299a0b0d9 Mon Sep 17 00:00:00 2001 From: Algiane Froehly Date: Thu, 17 Oct 2024 14:37:59 +0200 Subject: [PATCH 2/3] Attempt to use macos-14 for osx jobs with vtk=on. --- .github/workflows/main-job.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main-job.yml b/.github/workflows/main-job.yml index 7802eea54..f977c6624 100644 --- a/.github/workflows/main-job.yml +++ b/.github/workflows/main-job.yml @@ -37,10 +37,10 @@ jobs: pattern: [off] pointmap: [off] scotch: [off] - vtk: [on] + vtk: [off] int: [int32_t] - #include: + include: # test vtk only without scotch and with delaunay insertion (more # tests are useless) #- os: ubuntu-20.04 @@ -50,12 +50,12 @@ jobs: # vtk: on # int: int32_t - #- os: macos-12 - # pattern: off - # pointmap: off - # scotch: off - # vtk: on - # int: int32_t + - os: macos-14 + pattern: off + pointmap: off + scotch: off + vtk: on + int: int32_t # Test pointmap with scotch except on windows #- os: ubuntu-20.04 @@ -118,7 +118,7 @@ jobs: # vtk: off # int: int64_t # - #- os: macos-12 + #- os: macos-14 # pattern: on # pointmap: on # scotch: on @@ -342,7 +342,7 @@ jobs: cd build ctest --timeout 7200 -VV -C ${{ env.BUILD_TYPE }} -j ${{ env.NJOBS }} - - name: Test Mmg with in64_t integers + - name: Test Mmg with int64_t integers # Run long tests only on ubuntu with pattern off, scotch on, vtk on and int64_t integers if: matrix.os == 'ubuntu-20.04' && matrix.pattern == 'off' && matrix.scotch == 'on' && matrix.vtk == 'on' && matrix.int == 'int64_t' run: | From 12543e3fde7b54bca5e7b4f8f022e7a8ee4be340 Mon Sep 17 00:00:00 2001 From: Algiane Froehly Date: Thu, 17 Oct 2024 15:02:13 +0200 Subject: [PATCH 3/3] Manual revert of commit --- .github/workflows/main-job.yml | 178 ++++++++++++++++----------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/.github/workflows/main-job.yml b/.github/workflows/main-job.yml index f977c6624..9e6468842 100644 --- a/.github/workflows/main-job.yml +++ b/.github/workflows/main-job.yml @@ -33,22 +33,22 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] - pattern: [off] + os: [ubuntu-20.04,macos-12] + pattern: [on,off] pointmap: [off] - scotch: [off] + scotch: [on,off] vtk: [off] int: [int32_t] include: # test vtk only without scotch and with delaunay insertion (more # tests are useless) - #- os: ubuntu-20.04 - # pattern: off - # pointmap: off - # scotch: off - # vtk: on - # int: int32_t + - os: ubuntu-20.04 + pattern: off + pointmap: off + scotch: off + vtk: on + int: int32_t - os: macos-14 pattern: off @@ -58,93 +58,93 @@ jobs: int: int32_t # Test pointmap with scotch except on windows - #- os: ubuntu-20.04 - # pattern: off - # pointmap: on - # scotch: on - # vtk: off - # int: int32_t - - #- os: macos-12 - # pattern: off - # pointmap: on - # scotch: on - # vtk: off - # int: int32_t + - os: ubuntu-20.04 + pattern: off + pointmap: on + scotch: on + vtk: off + int: int32_t + + - os: macos-12 + pattern: off + pointmap: on + scotch: on + vtk: off + int: int32_t # Add windows basic test (matrix is not testable as dependencies # don't build with MSVC) - #- os: windows-2022 - # pattern: off - # pointmap: off - # scotch: off - # vtk: off - # int: int32_t - - #- os: windows-2022 - # pattern: on - # pointmap: off - # scotch: off - # vtk: off - # int: int32_t + - os: windows-2022 + pattern: off + pointmap: off + scotch: off + vtk: off + int: int32_t + + - os: windows-2022 + pattern: on + pointmap: off + scotch: off + vtk: off + int: int32_t # Add test for pointmap only if pattern off - #- os: windows-2022 - # pattern: off - # pointmap: on - # scotch: off - # vtk: off - # int: int32_t + - os: windows-2022 + pattern: off + pointmap: on + scotch: off + vtk: off + int: int32_t # Test int64_t build on all archi, and try to cover all code - #- os: ubuntu-20.04 - # pattern: on - # pointmap: on - # scotch: on - # vtk: on - # int: int64_t - # - #- os: ubuntu-20.04 - # pattern: off - # pointmap: off - # scotch: on - # vtk: on - # int: int64_t - # - #- os: ubuntu-20.04 - # pattern: off - # pointmap: off - # scotch: off - # vtk: off - # int: int64_t - # - #- os: macos-14 - # pattern: on - # pointmap: on - # scotch: on - # vtk: on - # int: int64_t - # - #- os: macos-12 - # pattern: off - # pointmap: off - # scotch: off - # vtk: off - # int: int64_t - # - #- os: windows-2022 - # pattern: on - # pointmap: on - # scotch: off - # vtk: off - # int: int64_t - # - #- os: windows-2022 - # pattern: off - # pointmap: off - # scotch: off - # vtk: off - # int: int64_t + - os: ubuntu-20.04 + pattern: on + pointmap: on + scotch: on + vtk: on + int: int64_t + + - os: ubuntu-20.04 + pattern: off + pointmap: off + scotch: on + vtk: on + int: int64_t + + - os: ubuntu-20.04 + pattern: off + pointmap: off + scotch: off + vtk: off + int: int64_t + + - os: macos-14 + pattern: on + pointmap: on + scotch: on + vtk: on + int: int64_t + + - os: macos-12 + pattern: off + pointmap: off + scotch: off + vtk: off + int: int64_t + + - os: windows-2022 + pattern: on + pointmap: on + scotch: off + vtk: off + int: int64_t + + - os: windows-2022 + pattern: off + pointmap: off + scotch: off + vtk: off + int: int64_t steps: - name: Set cmake_build_type and export coverage flags