diff --git a/.github/actions/setup-common/action.yml b/.github/actions/setup-common/action.yml index eff43909f2..f7074a0bb7 100644 --- a/.github/actions/setup-common/action.yml +++ b/.github/actions/setup-common/action.yml @@ -11,7 +11,7 @@ inputs: description: 'Can take the values: OFF, LOCAL, SYSTEM' default: 'OFF' oldest-cmake: - description: 'Can take the values: true, false. Only useful on Linux' + description: 'Can take the values: true, false. Only useful on Linux to force using the minimum required CMake' default: 'false' runs: using: "composite" diff --git a/.github/workflows/ci-unix-shared-installed.yml b/.github/workflows/ci-unix-shared-installed.yml index 4437839982..5597c23a08 100644 --- a/.github/workflows/ci-unix-shared-installed.yml +++ b/.github/workflows/ci-unix-shared-installed.yml @@ -16,14 +16,19 @@ jobs: build-shared-installed: strategy: fail-fast: false + # Generate the configurations: + # Ubuntu with gcc 14 with oldest-cmake set to true or false + # OSX with default gcc and CMake (oldest-cmake is unused on OSX) matrix: os: [ubuntu-24.04, macos-latest] oldest-cmake: [false, true] include: + # Add a gcc version on Ubuntu only - os: ubuntu-24.04 compiler: gcc gcc: 14 exclude: + # Do not use the oldest CMake on OSX - os: macos-latest oldest-cmake: true runs-on: ${{ matrix.os }}