From da8939fc53940fd6fb5d4a6788b17ee840acee9e Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Thu, 2 May 2024 16:18:26 +0100
Subject: [PATCH] Revert test

---
 .github/workflows/build_mac.yml               |  7 -----
 .../roles/Common/tasks/MacOSX.yml             | 28 +++++++++----------
 .../roles/Common/vars/MacOSX.yml              |  1 -
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index b78f5f5587..41ac097728 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -31,13 +31,6 @@ jobs:
       run: |
         sed -i '' 's/keyserver\.ubuntu\.com/185.125.188.27/g' ansible/playbooks/Supporting_Scripts/package_signature_verification.sh
 
-    - name: Remove Cmake
-      run: |
-        sudo rm -rf /usr/local/bin/cmake
-        sudo rm -rf /usr/local/doc/cmake
-        sudo rm -rf /usr/local/man/man1/cmake.1
-        sudo rm -rf /Applications/CMake.app
-
     - name: Run Ansible Playbook
       run: |
         echo "localhost ansible_user=runner ansible_connection=local" > ansible/hosts
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 14603ca0b0..87752954e0 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -125,20 +125,20 @@
   with_items: "{{ Build_Tool_Packages }}"
   tags: build_tools
 
-# # Install CMAKE Where It Doesnt exist
-# - name: Check If Cmake Is installed
-#   stat:
-#     path: "/opt/homebrew/bin/cmake"
-#   register: cmake
-#
-# - name: Install Cmake
-#   become: yes
-#   become_user: "{{ ansible_user }}"
-#   homebrew:
-#     name: "cmake"
-#     state: present
-#   tags: build_tools
-#   when: not cmake.stat.exists
+# Install CMAKE Where It Doesnt exist
+- name: Check If Cmake Is installed
+  stat:
+    path: "/opt/homebrew/bin/cmake"
+  register: cmake
+
+- name: Install Cmake
+  become: yes
+  become_user: "{{ ansible_user }}"
+  homebrew:
+    name: "cmake"
+    state: present
+  tags: build_tools
+  when: not cmake.stat.exists
 
 - name: Install Build Tool Packages NOT macOS 10.12
   become: yes
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml
index f295169d29..be418e5063 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml
@@ -9,7 +9,6 @@ Build_Tool_Packages:
   - autoconf
   - automake # for compiling freetype on JDK8u
   - coreutils
-  - cmake
   - gnupg
   - gnu-sed
   - gnu-tar