Skip to content
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.

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

[GH actions] Adding CMake 4.0 version to CI #17927

Draft
wants to merge 13 commits into
base: develop2
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 5 additions & 1 deletion .ci/docker/conan-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -120,12 +121,15 @@ 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-4.0.0-rc3-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 && \
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 && \
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/osx-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
uses: actions/cache@v4
with:
path: |
~/Applications/CMake/4.0.0-rc3
~/Applications/CMake/3.15.7
~/Applications/CMake/3.19.7
~/Applications/CMake/3.23.5
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/win-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc3
C:\tools\bazel\6.5.0
C:\tools\bazel\7.4.1
C:\tools\bazel\8.0.0
Expand All @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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/4.0.0-rc3/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': {
Expand Down
Loading