Skip to content

Commit 14f8809

Browse files
tejlmandmbolivar-nordic
authored andcommitted
[nrf noup] REVERTME: ci: Bump to use CMake 3.20.5
NOTE TO MAINTAINERS: This should be reverted before the next upmerge. It was originally cherry picked from commit e78cb74 ("ci: Bump to use CMake 3.20.5") upstream, but manual conflict resolution was required. Rather than bring in other additional patches, we're just replicating its effect here in NCS for CI purposes. We'll get it back from upstream after reverting when we next synchronzie. With CMake minimum required as 3.20.0 we update CI to use docker image v0.18.2, which contains CMake 3.20.5. For doc builds we fetch the same CMake v3.20.5 but using pip as the doc build doesn't use the docker image. The main reason for increasing CMake version is better toolchain support. The decision to bump the CMake version was taken by the Toolchain WG. Better toolchain support is added in the following CMake versions: - armclang, CMake 3.15 - Intel oneAPI, CMake 3.20 - IAR, CMake 3.15 and 3.20 Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Martí Bolívar <[email protected]>
1 parent 5a1177b commit 14f8809

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
manual: true
1111
plugins:
1212
- docker#v3.5.0:
13-
image: "zephyrprojectrtos/ci:v0.17.1"
13+
image: "zephyrprojectrtos/ci:v0.18.2"
1414
propagate-environment: true
1515
volumes:
1616
- "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"

.github/workflows/bsim.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
needs: bsim-build-cancel
2424
container:
25-
image: zephyrprojectrtos/ci:v0.17.1
25+
image: zephyrprojectrtos/ci:v0.18.2
2626
options: '--entrypoint /bin/bash'
2727
env:
2828
ZEPHYR_TOOLCHAIN_VARIANT: zephyr

.github/workflows/clang.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
needs: clang-build-cancel
1616
container:
17-
image: zephyrprojectrtos/ci:v0.17.1
17+
image: zephyrprojectrtos/ci:v0.18.2
1818
options: '--entrypoint /bin/bash'
1919
strategy:
2020
fail-fast: false

.github/workflows/doc-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
- 'scripts/dts/**'
2020
- 'scripts/requirements-doc.txt'
2121

22+
env:
23+
# The latest CMake available directly with apt is 3.18, but we need >=3.20
24+
# so we fetch that through pip.
25+
CMAKE_VERSION: 3.20.5
26+
2227
jobs:
2328
doc-build:
2429
name: "Documentation Build"
@@ -47,6 +52,7 @@ jobs:
4752
sudo pip3 install -U setuptools wheel pip
4853
pip3 install -r scripts/requirements-doc.txt
4954
pip3 install west==0.11.0
55+
pip3 install cmake==${CMAKE_VERSION}
5056
5157
- name: west setup
5258
run: |

.github/workflows/errno.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-errno:
99
runs-on: ubuntu-latest
1010
container:
11-
image: zephyrprojectrtos/ci:v0.17.1
11+
image: zephyrprojectrtos/ci:v0.18.2
1212

1313
steps:
1414
- name: checkout

0 commit comments

Comments
 (0)