From 84ba30bf0bfd1e9ce40b8029989ea694b7ca3f01 Mon Sep 17 00:00:00 2001 From: Jordan Layfield <77847327+layfield-ccdc@users.noreply.github.com> Date: Mon, 18 Mar 2024 12:48:25 +0000 Subject: [PATCH 1/3] updates to new homebrew DO-659 --- tasks/Darwin.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 438443f..602dbc4 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -1,7 +1,9 @@ --- -- name: Install required libraries - homebrew: - name: - - libomp # Used by xgboost: pip packages require this library, while conda packages of xgboost don't - - tcl-tk # used by the base python builds - state: present +- name: Insall Homebrew + required libraries + ansible.builtin.include_role: + name: geerlingguy.mac.homebrew + vars: + homebrew_installed_packages: + - libomp + - tcl-tk +# This is overwritten by our group_vars (cpp.build-machines) From af5ceb1f5e68ee21f136596fed8f6aeb8620843d Mon Sep 17 00:00:00 2001 From: Jordan Layfield <77847327+layfield-ccdc@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:12:21 +0000 Subject: [PATCH 2/3] added when DO-659 --- tasks/Darwin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 602dbc4..3e7d26e 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -6,4 +6,5 @@ homebrew_installed_packages: - libomp - tcl-tk + when: not cpp_buildmachine # This is overwritten by our group_vars (cpp.build-machines) From 3367eb8f6b7d83734c2082b2fde7219dd48b33d4 Mon Sep 17 00:00:00 2001 From: Jordan Layfield <77847327+layfield-ccdc@users.noreply.github.com> Date: Mon, 15 Apr 2024 10:46:59 +0100 Subject: [PATCH 3/3] spell check DO-659 --- tasks/Darwin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/Darwin.yml b/tasks/Darwin.yml index 3e7d26e..5cab2f9 100644 --- a/tasks/Darwin.yml +++ b/tasks/Darwin.yml @@ -1,5 +1,5 @@ --- -- name: Insall Homebrew + required libraries +- name: Install Homebrew + required libraries ansible.builtin.include_role: name: geerlingguy.mac.homebrew vars: