Skip to content

Commit 632892b

Browse files
authored
unixPB: Update cmake to 3.15.0 for jdk25u devkit (#4019)
* unixPB: Update cmake to 3.15.0 for jdk25u devkit Signed-off-by: Stewart X Addison <[email protected]> --------- Signed-off-by: Stewart X Addison <[email protected]>
1 parent bf81785 commit 632892b

File tree

1 file changed

+8
-5
lines changed
  • ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/cmake/tasks

1 file changed

+8
-5
lines changed

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/cmake/tasks/main.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
---
22
############################################################################
3-
# cmake - required by OpenJ9 and OpenJFX builds - requires C++11 compiler #
3+
# cmake - required by OpenJ9, OpenJFX and Wazuh - requires C++11 compiler #
44
############################################################################
55

6+
# 3.15.0 is required to be able to build the ccache version from the jdk25u devkit
7+
# The newer 4.1.0 would be more consistent with the version OpenJ9 uses on macos
8+
# But 3.15.0 will mean it can use the system on on Ubuntu 20+ without rebuilding here
69
- name: Set cmake version
7-
set_fact: cmakeVersion=3.11.4
10+
set_fact: cmakeVersion=3.15.0
811
tags: cmake
912

1013
- name: Test if cmake is installed on path
@@ -25,12 +28,12 @@
2528

2629
- name: Download cmake
2730
get_url:
28-
url: https://github.com/Kitware/CMake/releases/download/v3.11.4/cmake-{{ cmakeVersion }}.tar.gz
31+
url: https://github.com/Kitware/CMake/releases/download/v{{ cmakeVersion }}/cmake-{{ cmakeVersion }}.tar.gz
2932
dest: /tmp/cmake-{{ cmakeVersion }}.tar.gz
3033
mode: 0440
3134
force: no
3235
validate_certs: no
33-
checksum: sha256:8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5
36+
checksum: sha256:0678d74a45832cacaea053d85a5685f3ed8352475e6ddf9fcb742ffca00199b5
3437
when:
3538
- (cmake_installed.rc != 0 ) or (cmake_installed.rc == 0 and cmake_version.stdout is version_compare(cmakeVersion, operator='lt'))
3639
- ansible_architecture != "armv7l"
@@ -39,7 +42,7 @@
3942

4043
# The checksum file of the download is checked, not the binary itself. The checksum in the download step is equal to the one in the file
4144
- name: GPG Signature verification
42-
script: ../Supporting_Scripts/package_signature_verification.sh -fl "https://github.com/Kitware/CMake/releases/download/v3.11.4/cmake-3.11.4-SHA-256.txt" -sl "https://github.com/Kitware/CMake/releases/download/v3.11.4/cmake-3.11.4-SHA-256.txt.asc" -k {{ key.cmake }}
45+
script: ../Supporting_Scripts/package_signature_verification.sh -fl "https://github.com/Kitware/CMake/releases/download/v{{ cmake_version }}/cmake-{{ cmake_version }}-SHA-256.txt" -sl "https://github.com/Kitware/CMake/releases/download/v{{ cmake_version }}/cmake-{{ cmake_version }}-SHA-256.txt.asc" -k {{ key.cmake }}
4346
when:
4447
- (cmake_installed.rc != 0 ) or (cmake_installed.rc == 0 and cmake_version.stdout is version_compare(cmakeVersion, operator='lt'))
4548
- ansible_architecture != "armv7l"

0 commit comments

Comments
 (0)