From 5e1bcf3f76bfeef44723d2016b1bdddf7c45571a Mon Sep 17 00:00:00 2001
From: mouse <mouse@squirrel>
Date: Sun, 6 Nov 2022 00:20:44 +1100
Subject: [PATCH] stop gradle pacman error on ubuntu

---
 roles/custom/matrix-ma1sd/tasks/setup_install.yml        | 9 ++-------
 .../tasks/util/ensure_gradle_installed_archlinux.yml     | 6 ++++++
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 roles/custom/matrix-ma1sd/tasks/util/ensure_gradle_installed_archlinux.yml

diff --git a/roles/custom/matrix-ma1sd/tasks/setup_install.yml b/roles/custom/matrix-ma1sd/tasks/setup_install.yml
index 70f7937a..b9668a05 100644
--- a/roles/custom/matrix-ma1sd/tasks/setup_install.yml
+++ b/roles/custom/matrix-ma1sd/tasks/setup_install.yml
@@ -74,13 +74,8 @@
         msg: "Installing gradle on RedHat ({{ ansible_distribution }}) is currently not supported, so self-building ma1sd cannot happen at this time"
       when: ansible_os_family == 'RedHat'
 
-    - name: Ensure gradle is installed for self-building (Archlinux)
-      community.general.pacman:
-        name:
-          - gradle
-        state: present
-        update_cache: true
-      when: ansible_distribution == 'Archlinux'
+    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/util/ensure_gradle_installed_archlinux.yml"
+      when: "ansible_distribution == 'Archlinux'"
 
     - name: Ensure ma1sd repository is present on self-build
       ansible.builtin.git:
diff --git a/roles/custom/matrix-ma1sd/tasks/util/ensure_gradle_installed_archlinux.yml b/roles/custom/matrix-ma1sd/tasks/util/ensure_gradle_installed_archlinux.yml
new file mode 100644
index 00000000..cfe38a8d
--- /dev/null
+++ b/roles/custom/matrix-ma1sd/tasks/util/ensure_gradle_installed_archlinux.yml
@@ -0,0 +1,6 @@
+---
+
+- name: Ensure gradle installed (Archlinux)
+  community.general.pacman:
+    name: gradle
+    state: present