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.

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

Windows CI: use preinstalled CMake instead installing specific version #2438

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Windows CI: use preinstalled CMake instead installing specific version #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
container: ubuntu:20.04
- name: windows_cl-2022_debug_analysis
os: windows-2022
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.78.0, ALPAKA_CI_CMAKE_VER: 3.25.3, ALPAKA_CI_ANALYSIS: ON, alpaka_DEBUG: 2}
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.78.0, ALPAKA_CI_CMAKE_VER: 3, ALPAKA_CI_ANALYSIS: ON, alpaka_DEBUG: 2}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would "3" work for any 3.x installed or it means directly 3.0 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the package manager we use to install cmake does not supports minor versions and will use something modern.
Lets wait for a response from @SimeonEhrig

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3 means only the major version is specified. At the moment CMake 3.31 is preinstalled. If MS is updating the image we get a another version of CMake 3 (probably something newer than 3.31).
I cannot uninstall the preinstalled version. Therefore I cannot decide what we use and I thought CMake 4 will be not released soon the the version 3 shows that we only get CMake 3.

- name: macos_xcode-15.4_debug_analysis
os: macos-14
env: {ALPAKA_CI_CXX: clang++, ALPAKA_CI_XCODE_VER: 15.4, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.81.0, ALPAKA_CI_ANALYSIS: ON, alpaka_DEBUG: 2, alpaka_ACC_CPU_B_OMP2_T_SEQ_ENABLE: ON, alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE: ON, ALPAKA_CI_BUILD_JOBS: 3}
Expand All @@ -135,10 +135,10 @@ jobs:
### Windows
- name: windows_cl-2022_release
os: windows-2022
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Release, ALPAKA_BOOST_VERSION: 1.79.0, ALPAKA_CI_CMAKE_VER: 3.25.3, OMP_NUM_THREADS: 1}
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Release, ALPAKA_BOOST_VERSION: 1.79.0, ALPAKA_CI_CMAKE_VER: 3 , OMP_NUM_THREADS: 1}
- name: windows_cl-2022_debug
os: windows-2022
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.80.0, ALPAKA_CI_CMAKE_VER: 3.25.1, OMP_NUM_THREADS: 4, alpaka_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF, alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF}
env: {ALPAKA_CI_CXX: cl.exe, ALPAKA_CI_CL_VER: 2022, CMAKE_BUILD_TYPE: Debug, ALPAKA_BOOST_VERSION: 1.80.0, ALPAKA_CI_CMAKE_VER: 3 , OMP_NUM_THREADS: 4, alpaka_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF, alpaka_ACC_CPU_B_SEQ_T_OMP2_ENABLE: OFF}

## CUDA 12.1
# nvcc + MSVC
Expand Down
7 changes: 5 additions & 2 deletions script/install_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ then
fi
elif [ "$ALPAKA_CI_OS_NAME" = "Windows" ]
then
choco uninstall cmake.install
choco install cmake.install --no-progress --version ${ALPAKA_CI_CMAKE_VER}
# uninstalling CMake is broken in the GitHub Actions Windows Image
# therefore we need to use what is installed
#choco uninstall cmake.install
#choco install cmake.install --no-progress --version ${ALPAKA_CI_CMAKE_VER}
cmake --version
fi
fi
fi
Expand Down