Skip to content

Commit 7ab9649

Browse files
authored
unixPb: Remove Brew git from MacOS14 arm64 (adoptium#4211)
* unixPb: Remove Brew git from MacOS14 arm64 * correct conditional
1 parent 0e3236f commit 7ab9649

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,17 @@
138138
tags: build_tools
139139
when: not (cmake_homebrew.stat.exists or cmake_local.stat.exists)
140140

141+
- name: Install Build Tool Packages NOT MacOS 14 arm64
142+
become: true
143+
become_user: "{{ ansible_user }}"
144+
homebrew:
145+
name: "{{ item }}"
146+
state: present
147+
path: "{{ homebrew_path }}"
148+
with_items: "{{ Build_Tool_Packages_Not_MacOS14_arm64 }}"
149+
when: not ((macos_version_number | regex_search("14")) and ansible_architecture == "arm64")
150+
tags: build_tools
151+
141152
- name: Install Build Tool Packages NOT macOS 10.12
142153
become: true
143154
become_user: "{{ ansible_user }}"

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/MacOSX.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Build_Tool_Packages:
99
- autoconf
1010
- automake # for compiling freetype on JDK8u
1111
- coreutils
12-
- git
1312
- gnupg
1413
- gnu-sed
1514
- gnu-tar
@@ -18,6 +17,9 @@ Build_Tool_Packages:
1817
- bash # OpenJ9 needs bash v4 or later
1918
- make
2019

20+
Build_Tool_Packages_Not_MacOS14_arm64:
21+
- git # We want to use system git for MacOS14 arm64
22+
2123
Build_Tool_Packages_NOT_10_12:
2224
- ccache # ccache is no longer working on macOS 10.12
2325

0 commit comments

Comments
 (0)