From 6b7cb3654d78618a49226e361c6f34b7ea9ba29a Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:50:38 +0100 Subject: [PATCH 1/7] Update Ubuntu CI --- .github/workflows/ubuntu-ci.yml | 58 +++++++++++++++++---------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index e06ea125..3334ff98 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -71,47 +71,49 @@ jobs: var includes = [] // Debug builds (short CI) - includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'gcc-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'gcc-13', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) // Release builds (short CI) - includes.push({ compiler: 'gcc-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'gcc-13', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) if (ci_short) { return { include: includes } } // Debug builds (long CI) - includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) // Release builds (long CI) - includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'gcc-9', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'gcc-10', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'gcc-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-9', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-10', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-11', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-12', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) // Make sure project builds with CMake 3.25 - includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) // Make sure project builds with make - includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Unix Makefiles', cmake: '3.26.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Unix Makefiles', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) return { include: includes } From 62880b6d14a46480a8f538d3273062b08515f2c0 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:54:31 +0100 Subject: [PATCH 2/7] Update Codecov CI --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6b7c9cff..35c70276 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -54,7 +54,7 @@ jobs: needs: cache-test-dataset runs-on: ubuntu-latest container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-gcc-12 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-23.04-cxx-gcc-13 options: '--user=root' steps: From 22071aebfab7b6cd707c8f137ba400fe1c878df2 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:54:49 +0100 Subject: [PATCH 3/7] Update clang-tidy workflow [ci full] --- .github/workflows/run-clang-tidy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-clang-tidy.yml b/.github/workflows/run-clang-tidy.yml index 0f8f45b2..4f2f29dc 100644 --- a/.github/workflows/run-clang-tidy.yml +++ b/.github/workflows/run-clang-tidy.yml @@ -48,7 +48,7 @@ jobs: run-clang-tidy: runs-on: ubuntu-latest container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-15 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-23.04-cxx-clang-16 options: '--user=root' steps: From 9b34f5b092ab1ff9f6c8e44b4eb9e11e83f5d09d Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:25:50 +0100 Subject: [PATCH 4/7] Update CI --- .github/workflows/build-dockerfile.yml | 4 ++-- .github/workflows/fuzzy-testing.yml | 2 +- .github/workflows/run-clang-tidy.yml | 2 +- .github/workflows/ubuntu-ci.yml | 10 ++++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-dockerfile.yml b/.github/workflows/build-dockerfile.yml index 029f96a8..1f0d8939 100644 --- a/.github/workflows/build-dockerfile.yml +++ b/.github/workflows/build-dockerfile.yml @@ -69,8 +69,8 @@ jobs: OS_NAME='ubuntu' OS_VERSION='22.04' - C_COMPILER='gcc-12' - CXX_COMPILER='g++-12' + C_COMPILER='CLANG-17' + CXX_COMPILER='CLANG++-17' BUILD_BASE_IMAGE="ghcr.io/paulsengroup/ci-docker-images/$OS_NAME-$OS_VERSION-cxx-$C_COMPILER:latest" TEST_BASE_IMAGE="$BUILD_BASE_IMAGE" diff --git a/.github/workflows/fuzzy-testing.yml b/.github/workflows/fuzzy-testing.yml index e29c9cd2..2777851b 100644 --- a/.github/workflows/fuzzy-testing.yml +++ b/.github/workflows/fuzzy-testing.yml @@ -96,7 +96,7 @@ jobs: } container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-15 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-17 options: "--user=root" env: diff --git a/.github/workflows/run-clang-tidy.yml b/.github/workflows/run-clang-tidy.yml index 4f2f29dc..42bde0eb 100644 --- a/.github/workflows/run-clang-tidy.yml +++ b/.github/workflows/run-clang-tidy.yml @@ -48,7 +48,7 @@ jobs: run-clang-tidy: runs-on: ubuntu-latest container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-23.04-cxx-clang-16 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-17 options: '--user=root' steps: diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 3334ff98..279cb429 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -74,11 +74,11 @@ jobs: includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) includes.push({ compiler: 'gcc-13', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) includes.push({ compiler: 'clang-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'OFF' }) - includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-17', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) // Release builds (short CI) includes.push({ compiler: 'gcc-13', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) - includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-17', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) if (ci_short) { return { include: includes } @@ -95,6 +95,7 @@ jobs: includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Debug', developer_mode: 'ON' }) // Release builds (long CI) includes.push({ compiler: 'gcc-8', os: 'ubuntu-20.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) @@ -109,11 +110,12 @@ jobs: includes.push({ compiler: 'clang-13', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) includes.push({ compiler: 'clang-14', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) includes.push({ compiler: 'clang-15', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) + includes.push({ compiler: 'clang-16', os: 'ubuntu-22.04', generator: 'Ninja', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'ON' }) // Make sure project builds with CMake 3.25 - includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-17', os: 'ubuntu-23.04', generator: 'Ninja', cmake: '3.25.2', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) // Make sure project builds with make - includes.push({ compiler: 'clang-16', os: 'ubuntu-23.04', generator: 'Unix Makefiles', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) + includes.push({ compiler: 'clang-17', os: 'ubuntu-23.04', generator: 'Unix Makefiles', cmake: '3.27.*', conan: '2.0.*', build_type: 'Release', developer_mode: 'OFF' }) return { include: includes } From 4db88df2fe82303127f4bf9b5151b258d736357f Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:52:21 +0100 Subject: [PATCH 5/7] Bugfix --- .github/workflows/codecov.yml | 2 +- .github/workflows/fuzzy-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 35c70276..c26008cf 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -226,7 +226,7 @@ jobs: with: fail_ci_if_error: true gcov: true - gcov_executable: gcov-12 + gcov_executable: gcov-13 os: linux token: ${{ secrets.CODECOV_TOKEN }} verbose: true diff --git a/.github/workflows/fuzzy-testing.yml b/.github/workflows/fuzzy-testing.yml index 2777851b..2a2352e9 100644 --- a/.github/workflows/fuzzy-testing.yml +++ b/.github/workflows/fuzzy-testing.yml @@ -96,7 +96,7 @@ jobs: } container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-17 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-23.04-cxx-gcc-13 options: "--user=root" env: From 8c8b01e2f7acc8da31e8efa6760cf9327a9113c5 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:59:40 +0100 Subject: [PATCH 6/7] Bugfix --- .github/workflows/fuzzy-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fuzzy-testing.yml b/.github/workflows/fuzzy-testing.yml index 2a2352e9..a416bcee 100644 --- a/.github/workflows/fuzzy-testing.yml +++ b/.github/workflows/fuzzy-testing.yml @@ -96,7 +96,7 @@ jobs: } container: - image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-23.04-cxx-gcc-13 + image: ghcr.io/paulsengroup/ci-docker-images/ubuntu-22.04-cxx-clang-16 options: "--user=root" env: From 057d14e69cda6ef05f5c04da0991277e9c8df0d0 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sat, 9 Dec 2023 13:01:24 +0100 Subject: [PATCH 7/7] Bugfix --- .github/workflows/build-dockerfile.yml | 4 ++-- .github/workflows/fuzzy-testing.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-dockerfile.yml b/.github/workflows/build-dockerfile.yml index 1f0d8939..73e16e0d 100644 --- a/.github/workflows/build-dockerfile.yml +++ b/.github/workflows/build-dockerfile.yml @@ -69,8 +69,8 @@ jobs: OS_NAME='ubuntu' OS_VERSION='22.04' - C_COMPILER='CLANG-17' - CXX_COMPILER='CLANG++-17' + C_COMPILER='clang-17' + CXX_COMPILER='clang++-17' BUILD_BASE_IMAGE="ghcr.io/paulsengroup/ci-docker-images/$OS_NAME-$OS_VERSION-cxx-$C_COMPILER:latest" TEST_BASE_IMAGE="$BUILD_BASE_IMAGE" diff --git a/.github/workflows/fuzzy-testing.yml b/.github/workflows/fuzzy-testing.yml index a416bcee..d74956f5 100644 --- a/.github/workflows/fuzzy-testing.yml +++ b/.github/workflows/fuzzy-testing.yml @@ -193,8 +193,8 @@ jobs: working-directory: hictkpy run: | pip install --upgrade pip setuptools wheel pybind11 - env CC=clang-15 \ - CXX=clang++-15 \ + env CC=clang-16 \ + CXX=clang++-16 \ CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$PWD/../build" \ HICTKPY_SETUP_SKIP_CONAN=1 \ pip install . -v