ansible: use packaged ninja-build

Use `ninja-build` from the OS package repository rather than build it ourselves from source.
nodejs · May 30, 2024 · 81456c7 · 81456c7
1 parent bec735f
commit 81456c7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 71 deletions.
diff --git a/ansible/roles/build-test-v8/meta/main.yml b/ansible/roles/build-test-v8/meta/main.yml
@@ -2,12 +2,6 @@
 # prebuilt binaries for x64 but for ppc64 and s390x we need to compile these
 # ourselves.
 dependencies:
-  - role: ninja
-    when: arch == 'ppc64' or arch == 's390x'
-    vars:
-      ninja_dest_dir: "{{ tools_dest_dir }}"
-      ninja_git_dir: "{{ tools_git_dir }}/ninja"
-      ninja_user: "{{ tools_user }}"
   - role: gn
     when: arch == 'ppc64' or arch == 's390x'
     vars:

diff --git a/ansible/roles/build-test-v8/tasks/partials/rhel8-ppc64.yml b/ansible/roles/build-test-v8/tasks/partials/rhel8-ppc64.yml
@@ -4,10 +4,16 @@
 # Install packages for V8 builds.
 #
 
+# ninja-build on RHEL 8 is in the CodeReady Linux Builder repository.
+- name: enable codeready-builder repository
+  community.general.rhsm_repository:
+    name: codeready-builder-for-rhel-8-ppc64le-rpms
+    state: enabled
+
 # V8 builds still require Python 2.
 - name: install packages required to build V8
   ansible.builtin.dnf:
-    name: ['glib2-devel', 'python2', 'python2-pip']
+    name: ['glib2-devel', 'ninja-build', 'python2', 'python2-pip']
     state: present
   notify: package updated
 

diff --git a/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml b/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml
@@ -4,10 +4,16 @@
 # Install packages for V8 builds.
 #
 
+# ninja-build on RHEL 8 is in the CodeReady Linux Builder repository.
+- name: enable codeready-builder repository
+  community.general.rhsm_repository:
+    name: codeready-builder-for-rhel-8-s390x-rpms
+    state: enabled
+
 # Older V8 builds still require Python 2.
 - name: install packages required to build V8
   ansible.builtin.dnf:
-    name: ['GConf2-devel', 'python2', 'python2-pip']
+    name: ['GConf2-devel', 'ninja-build', 'python2', 'python2-pip']
     state: present
   notify: package updated
 

diff --git a/ansible/roles/ninja/meta/argument_specs.yml b/ansible/roles/ninja/meta/argument_specs.yml
diff --git a/ansible/roles/ninja/tasks/main.yml b/ansible/roles/ninja/tasks/main.yml