Skip to content

Commit ec908a7

Browse files
committed
CI: Do not downgrade CMake to 3.x
1 parent 8fc13b8 commit ec908a7

8 files changed

Lines changed: 0 additions & 64 deletions

File tree

.github/workflows/Docs.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030

31-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
32-
- name: Install CMake < 4.0
33-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
34-
with:
35-
cmake-version: '3.x'
36-
3731
- name: Install doxygen >= 1.9.0 + other dependencies
3832
run: |
3933
# Install graphviz + dependencies to build doxygen from source

.github/workflows/Draft-Release.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@ jobs:
8787
steps:
8888
- uses: actions/checkout@v4
8989

90-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
91-
- name: Install CMake < 4.0
92-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
93-
with:
94-
cmake-version: '3.x'
95-
9690
- name: Install CUDA
9791
if: ${{ startswith(env.OS, 'ubuntu') && env.CUDA != '' }}
9892
env:
@@ -243,12 +237,6 @@ jobs:
243237
steps:
244238
- uses: actions/checkout@v4
245239

246-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
247-
- name: Install CMake < 4.0
248-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
249-
with:
250-
cmake-version: '3.x'
251-
252240
- name: Install CUDA (Windows)
253241
if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
254242
timeout-minutes: 35
@@ -400,11 +388,6 @@ jobs:
400388
cuda: ${{ env.CUDA }}
401389
run: .github/scripts/install_cuda_el8.sh
402390

403-
# Downgrade CMake for DeVIL. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
404-
- name: Install CMake < 4.0, overwriting the pipx installed version from manylinux
405-
run: |
406-
pipx install --global --force 'cmake<4.0'
407-
408391
- name: Install Visualisation Dependencies (EL 8)
409392
if: ${{ env.VISUALISATION == 'ON' }}
410393
run: |
@@ -558,12 +541,6 @@ jobs:
558541
steps:
559542
- uses: actions/checkout@v4
560543

561-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
562-
- name: Install CMake < 4.0
563-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
564-
with:
565-
cmake-version: '3.x'
566-
567544
- name: Install CUDA (Windows)
568545
if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
569546
shell: powershell

.github/workflows/Lint.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v4
4545

46-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
47-
- name: Install CMake < 4.0
48-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
49-
with:
50-
cmake-version: '3.x'
51-
5246
- name: Install CUDA
5347
if: ${{ startswith(env.OS, 'ubuntu') && env.CUDA != '' }}
5448
env:

.github/workflows/MPI.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ jobs:
9393
steps:
9494
- uses: actions/checkout@v4
9595

96-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
97-
- name: Install CMake < 4.0
98-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
99-
with:
100-
cmake-version: '3.x'
101-
10296
- name: Install CUDA
10397
if: ${{ startswith(env.OS, 'ubuntu') && env.CUDA != '' }}
10498
env:

.github/workflows/Manylinux_2_28.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ jobs:
103103
cuda: ${{ env.CUDA }}
104104
run: .github/scripts/install_cuda_el8.sh
105105

106-
# Downgrade CMake for DeVIL. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
107-
- name: Install CMake < 4.0, overwriting the pipx installed version from manylinux
108-
run: |
109-
pipx install --global --force 'cmake<4.0'
110-
111106
- name: Install Visualisation Dependencies (EL 8)
112107
if: ${{ env.VISUALISATION == 'ON' }}
113108
run: |

.github/workflows/Ubuntu.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ jobs:
100100
steps:
101101
- uses: actions/checkout@v4
102102

103-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
104-
- name: Install CMake < 4.0
105-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
106-
with:
107-
cmake-version: '3.x'
108-
109103
- name: Install CUDA
110104
if: ${{ startswith(env.OS, 'ubuntu') && env.CUDA != '' }}
111105
env:

.github/workflows/Windows-Tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ jobs:
7272
steps:
7373
- uses: actions/checkout@v4
7474

75-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
76-
- name: Install CMake < 4.0
77-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
78-
with:
79-
cmake-version: '3.x'
80-
8175
- name: Install CUDA (Windows)
8276
if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
8377
shell: powershell

.github/workflows/Windows.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@ jobs:
120120
steps:
121121
- uses: actions/checkout@v4
122122

123-
# Downgrade CMake while some dependencies are not CMake 4 compatible. See https://github.com/FLAMEGPU/FLAMEGPU2/issues/1276
124-
- name: Install CMake < 4.0
125-
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be
126-
with:
127-
cmake-version: '3.x'
128-
129123
- name: Install CUDA (Windows)
130124
if: ${{ runner.os == 'Windows' && env.CUDA != '' }}
131125
shell: powershell

0 commit comments

Comments
 (0)