From 7b001cf2ac4c45a8abe2d6a4747fd610f209b12c Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Aug 2021 13:40:32 +0200 Subject: [PATCH 1/4] add explicit list of tests to exclude --- .github/workflows/buildAndDocumentation.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index 57552445f8..de0c5a033d 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -9,6 +9,9 @@ env: CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue + # List of tests to exclude from Ctest. For example -E "(test1)|(test2)..." + EXCLUDE_TESTS: "-E \"(testLinearStructure)\" " + # -DDGTAL_RANDOMIZED_TESTING_WHITELIST=$(../.travis/create_whitelist.sh)"\ jobs: @@ -24,7 +27,7 @@ jobs: - name: Install linux deps if: matrix.os == 'ubuntu-latest' - run: | + run: | sudo apt-get update sudo apt-get install libqglviewer-dev-qt5 libboost-dev libeigen3-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libgraphicsmagick++1-dev libfftw3-dev @@ -56,7 +59,7 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build shell: bash - run: ctest -C $BUILD_TYPE --output-on-failure + run: ctest -C $BUILD_TYPE --output-on-failure -E testLinearStructure $EXCLUDE_TESTS - name: DGtalTools (linux only, we check this PR against DGtalTools master) if: matrix.os == 'ubuntu-latest' @@ -70,7 +73,7 @@ jobs: echo cmake .. -DDGTAL_DIR=${{runner.workspace}}/build -DDGTALTOOLS_RANDOMIZED_BUILD_THRESHOLD=25 -G Ninja cmake .. -DDGtal_DIR=${{runner.workspace}}/build -G Ninja ninja - + # Documentatin (build, check and deploy) Documentation: runs-on: ubuntu-latest From 25a88bc01a48c20896671f34f21a76d02b8b7dcd Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Aug 2021 13:41:58 +0200 Subject: [PATCH 2/4] add explicit list of tests to exclude (Changelog) --- ChangeLog.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 71fb746bae..e2d21eb71a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -31,9 +31,10 @@ (David Coeurjolly, [#1578](https://github.com/DGtal-team/DGtal/pull/1578)) - Various warnings / deprecated functions (David Coeurjolly, [#1583](https://github.com/DGtal-team/DGtal/pull/1583) - - Removing old snapshot of catch.hpp. Now DGtal compiles on Apple M1 (David Coeurjolly, - [#1590](https://github.com/DGtal-team/DGtal/pull/1590) - + - Removing old snapshot of catch.hpp. Now DGtal compiles on Apple M1 (David Coeurjolly, + [#1590](https://github.com/DGtal-team/DGtal/pull/1590)) + - Adding a explicit list of tests to exclude from Github Actions + (David Coeurjolly, [#1596](https://github.com/DGtal-team/DGtal/pull/1596) # DGtal 1.2 From 9dd4269f5ac2af808d22b7a44ab9f6182024101e Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Aug 2021 13:43:50 +0200 Subject: [PATCH 3/4] add explicit list of tests to exclude (Changelog) --- .github/workflows/buildAndDocumentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index de0c5a033d..2f1ee51c30 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -59,7 +59,7 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build shell: bash - run: ctest -C $BUILD_TYPE --output-on-failure -E testLinearStructure $EXCLUDE_TESTS + run: ctest -C $BUILD_TYPE --output-on-failure $EXCLUDE_TESTS - name: DGtalTools (linux only, we check this PR against DGtalTools master) if: matrix.os == 'ubuntu-latest' From 464626ff02a9b1c3363deba991d9012dd756aac1 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 24 Aug 2021 13:46:55 +0200 Subject: [PATCH 4/4] Update buildAndDocumentation.yml --- .github/workflows/buildAndDocumentation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index 2f1ee51c30..aee9621bc2 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -8,7 +8,6 @@ env: CONFIG_GLOBAL: -DBUILD_EXAMPLES=true -DBUILD_TESTING=true -DDGTAL_RANDOMIZED_TESTING_THRESHOLD=25 CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue - # List of tests to exclude from Ctest. For example -E "(test1)|(test2)..." EXCLUDE_TESTS: "-E \"(testLinearStructure)\" "