Skip to content

Add main config with test threshold #1825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcoeurjo merged 3 commits into from
Dec 9, 2025
+35 −3
Merged

Add main config with test threshold #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff9cda
Add main config with test threshold
BDoignies Dec 9, 2025
feaaab6
Merge branch 'main' into MainTests
BDoignies Dec 9, 2025
34d7b60
Fix typo
BDoignies Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion .github/actions/dgtal-config/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ outputs:
description: "Configuration line."
value: ${{ steps.cmake-output.outputs.cmake-config }}

cmake-test-threshold:
description: "Test threshold"
value: ${{ steps.cmake-output.outputs.cmake-test-threshold }}

cmake-test-blacklist:
description: "Test that should be blacklisted"
value: ${{ steps.cmake-output.outputs.cmake-test-blacklist }}
Expand All @@ -32,38 +36,65 @@ runs:
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true -DDGTAL_WITH_FFTW3=true -DDGTAL_WITH_HDF5=true -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_POLYSCOPE_VIEWER=true -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DDGTAL_WARNING_AS_ERROR=ON -G Ninja" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=0" >> "$GITHUB_ENV"

- name: "Default MacOS"
if: ${{ runner.os == 'macOS' && inputs.config-name == 'default' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_WITH_CGAL=true" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=0" >> "$GITHUB_ENV"

- name: "Default Windows"
if: ${{ runner.os == 'Windows' && inputs.config-name == 'default' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DCMAKE_TOOLCHAIN_FILE='conan_toolchain.cmake'" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=0" >> "$GITHUB_ENV"

# PR Configurations
- name: "PR Linux"
if: ${{ runner.os == 'Linux' && inputs.config-name == 'PR' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true -DUSE_CCACHE=NO -DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true -DDGTAL_WITH_FFTW3=true -DDGTAL_WITH_HDF5=true -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_POLYSCOPE_VIEWER=true -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DDGTAL_WARNING_AS_ERROR=ON -G Ninja" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=10" >> "$GITHUB_ENV"

- name: "PR MacOS"
if: ${{ runner.os == 'macOS' && inputs.config-name == 'PR' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true -DUSE_CCACHE=NO -DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=10" >> "$GITHUB_ENV"

- name: "PR Windows"
if: ${{ runner.os == 'Windows' && inputs.config-name == 'PR' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DCMAKE_TOOLCHAIN_FILE='conan_toolchain.cmake' -DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true" >> "$GITHUB_ENV"

echo "DGTAL_TEST_THRESHOLD=10" >> "$GITHUB_ENV"

# Main configuration
- name: "Main Linux"
if: ${{ runner.os == 'Linux' && inputs.config-name == 'main' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true -DUSE_CCACHE=NO -DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true -DDGTAL_WITH_FFTW3=true -DDGTAL_WITH_HDF5=true -DDGTAL_WITH_OPENMP=true -DDGTAL_WITH_POLYSCOPE_VIEWER=true -DDGTAL_WITH_CAIRO=true -DDGTAL_WITH_ITK=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true -DDGTAL_WARNING_AS_ERROR=ON -G Ninja" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=100" >> "$GITHUB_ENV"

- name: "Main MacOS"
if: ${{ runner.os == 'macOS' && inputs.config-name == 'main' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true -DUSE_CCACHE=NO -DDGTAL_WITH_CGAL=true -DDGTAL_WITH_LIBIGL=true" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=100" >> "$GITHUB_ENV"

- name: "Main Windows"
if: ${{ runner.os == 'Windows' && inputs.config-name == 'main' }}
shell: bash
run: |
echo "DGTAL_CMAKE_CONFIG=-DCMAKE_TOOLCHAIN_FILE='conan_toolchain.cmake' -DDGTAL_BUILD_TESTS=true -DDGTAL_BUILD_EXAMPLES=true" >> "$GITHUB_ENV"
echo "DGTAL_TEST_THRESHOLD=100" >> "$GITHUB_ENV"

# Only a single step outputs variables
- name: "Set CMake output"
Expand All @@ -74,3 +105,4 @@ runs:
echo "cmake-config=$(echo $DGTAL_CMAKE_CONFIG)" >> "$GITHUB_OUTPUT"
echo "cmake-test-blacklist='(testLinearStructure|testIntegerConverter|testArithmeticalDSSComputerOnSurfels|testStern)'" >> "$GITHUB_OUTPUT"
echo "cmake-test-whitelist='$( ${{ inputs.dgtal }}/.github/actions/dgtal-config/get_whitelist.sh )'" >> "$GITHUB_OUTPUT"
echo "cmake-test-threshold='$(echo $DGTAL_TEST_THRESHOLD)'" >> "$GITHUB_OUTPUT"
4 changes: 2 additions & 2 deletions .github/workflows/build-PR-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: "config"
uses: ./.github/actions/dgtal-config
with:
config-name: "PR"
config-name: ${{ github.event_name == 'push' && 'main' || 'PR' }}

- name: Setup OS
uses: ./.github/actions/setup-os
Expand All @@ -42,7 +42,7 @@ jobs:
build-type: ${{ matrix.build_type }}
build-config: ${{ steps.config.outputs.cmake-config }}
test: true
test-threshold: "10"
test-threshold: ${{ steps.config.outputs.cmake-test-threshold }}
test-blacklist: ${{ steps.config.outputs.cmake-test-blacklist }}
test-whitelist: ${{ steps.config.outputs.cmake-test-whitelist }}

Expand Down
Loading