From 46b72f54b57e4d9817f55466d56118db0365d6fe Mon Sep 17 00:00:00 2001 From: Ernesto de Gracia Herranz Date: Mon, 10 Mar 2025 18:00:52 +0100 Subject: [PATCH 1/3] new workflows and dockers --- .ci/docker/conan-tests | 3 +++ .github/workflows/osx-tests.yml | 3 ++- .github/workflows/win-tests.yml | 3 ++- test/conftest.py | 7 ++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests index 1ee57ab22dd..95282af8e70 100644 --- a/.ci/docker/conan-tests +++ b/.ci/docker/conan-tests @@ -16,6 +16,7 @@ ENV PY36=3.6.15 \ CMAKE_3_19=/usr/share/cmake-3.19.7/bin/cmake \ CMAKE_3_23=/usr/share/cmake-3.23.5/bin/cmake \ CMAKE_3_27=/usr/share/cmake-3.27.9/bin/cmake \ + CMAKE_4_0=/usr/share/cmake-4.0.0-rc3/bin/cmake \ GCC_9=/usr/bin/gcc-9 \ GXX_9=/usr/bin/g++-9 \ GCC_11=/usr/bin/gcc-11 \ @@ -120,6 +121,8 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7 tar -xvzf cmake-3.23.5-Linux-x86_64.tar.gz && mv cmake-3.23.5-linux-x86_64/ /usr/share/cmake-3.23.5 && \ wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-Linux-x86_64.tar.gz && \ tar -xvzf cmake-3.27.9-Linux-x86_64.tar.gz && mv cmake-3.27.9-linux-x86_64/ /usr/share/cmake-3.27.9 && \ + wget https://cmake.org/files/v4.0/cmake-4.0.0-rc3-linux-x86_64.tar.gz && \ + tar -xvzf cmake-4.0.0-rc3-linux-x86_64.tar.gz && mv cmake--linux-x86_64/ /usr/share/cmake-4.0.0-rc3 && \ update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_15 10 && \ update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_16 20 && \ update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_17 30 && \ diff --git a/.github/workflows/osx-tests.yml b/.github/workflows/osx-tests.yml index 1942d955ce5..ae15297e0f7 100644 --- a/.github/workflows/osx-tests.yml +++ b/.github/workflows/osx-tests.yml @@ -54,6 +54,7 @@ jobs: uses: actions/cache@v4 with: path: | + ~/Applications/CMake/4.0.0 ~/Applications/CMake/3.15.7 ~/Applications/CMake/3.19.7 ~/Applications/CMake/3.23.5 @@ -86,7 +87,7 @@ jobs: if: steps.cache-tools.outputs.cache-hit != 'true' run: | set -e - CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5" "3.27.9") + CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5" "3.27.9" "4.0.0-rc3") for version in "${CMAKE_PRECOMP_VERSIONS[@]}"; do echo "Downloading and installing precompiled universal CMake version ${version}..." wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}-macos-universal.tar.gz diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml index 75e21a27386..8409d3fce77 100644 --- a/.github/workflows/win-tests.yml +++ b/.github/workflows/win-tests.yml @@ -161,6 +161,7 @@ jobs: C:\tools\cmake\3.19.7 C:\tools\cmake\3.23.5 C:\tools\cmake\3.27.9 + C:\tools\cmake\4.0.0 C:\tools\bazel\6.5.0 C:\tools\bazel\7.4.1 C:\tools\bazel\8.0.0 @@ -169,7 +170,7 @@ jobs: - name: Install CMake versions if: steps.cache-tools.outputs.cache-hit != 'true' run: | - $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7", "3.23.5", "3.27.9" + $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7", "3.23.5", "3.27.9", "4.0.0-rc3" foreach ($version in $CMAKE_BUILD_VERSIONS) { Write-Host "Downloading CMake version $version for Windows..." $destination = "C:\tools\cmake\$version" diff --git a/test/conftest.py b/test/conftest.py index 9c9c76f7846..8f49d41b09e 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -66,7 +66,7 @@ }}, 'autotools': {"exe": "autoconf"}, 'cmake': { - "default": "3.15", + "default": "4.0-rc3", "3.15": { "path": {'Windows': 'C:/tools/cmake/3.15.7/cmake-3.15.7-win64-x64/bin', 'Darwin': '/Users/runner/Applications/CMake/3.15.7/bin', @@ -86,6 +86,11 @@ "path": {'Windows': 'C:/tools/cmake/3.27.9/cmake-3.27.9-windows-x86_64/bin', 'Darwin': '/Users/runner/Applications/CMake/3.27.9/bin', 'Linux': "/usr/share/cmake-3.27.9/bin"} + }, + "4.0-rc3": { + "path": {'Windows': 'C:/tools/cmake/3.27.9/cmake-4.0.0-rc3-windows-x86_64/bin', + 'Darwin': '/Users/runner/Applications/CMake/4.0.0-rc3/bin', + 'Linux': "/usr/share/cmake-4.0.0-rc3/bin"} } }, 'ninja': { From 800feb3329cb4c29ed4e477c934cc4b9be09e178 Mon Sep 17 00:00:00 2001 From: Ernesto de Gracia Herranz Date: Mon, 10 Mar 2025 18:24:29 +0100 Subject: [PATCH 2/3] wip --- .ci/docker/conan-tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests index 95282af8e70..fb218f96006 100644 --- a/.ci/docker/conan-tests +++ b/.ci/docker/conan-tests @@ -128,7 +128,8 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7 update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_17 30 && \ update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_19 40 && \ update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_23 50 && \ - update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_27 60 + update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_27 60 && \ + update-alternatives --install /usr/bin/cmake cmake $CMAKE_4_0 70 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 30 && \ From 9b5491edf2500072a99777dcedbd492adbab015c Mon Sep 17 00:00:00 2001 From: Ernesto de Gracia Herranz Date: Mon, 10 Mar 2025 18:29:02 +0100 Subject: [PATCH 3/3] wip --- .github/workflows/osx-tests.yml | 2 +- .github/workflows/win-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osx-tests.yml b/.github/workflows/osx-tests.yml index ae15297e0f7..43c73d9d397 100644 --- a/.github/workflows/osx-tests.yml +++ b/.github/workflows/osx-tests.yml @@ -54,7 +54,7 @@ jobs: uses: actions/cache@v4 with: path: | - ~/Applications/CMake/4.0.0 + ~/Applications/CMake/4.0.0-rc3 ~/Applications/CMake/3.15.7 ~/Applications/CMake/3.19.7 ~/Applications/CMake/3.23.5 diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml index 8409d3fce77..ee3d55f0cfb 100644 --- a/.github/workflows/win-tests.yml +++ b/.github/workflows/win-tests.yml @@ -161,7 +161,7 @@ jobs: C:\tools\cmake\3.19.7 C:\tools\cmake\3.23.5 C:\tools\cmake\3.27.9 - C:\tools\cmake\4.0.0 + C:\tools\cmake\4.0.0-rc3 C:\tools\bazel\6.5.0 C:\tools\bazel\7.4.1 C:\tools\bazel\8.0.0