Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ansible/roles/build-test-v8/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion ansible/roles/build-test-v8/tasks/partials/rhel8-ppc64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 7 additions & 1 deletion ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 0 additions & 17 deletions ansible/roles/ninja/meta/argument_specs.yml

This file was deleted.

46 changes: 0 additions & 46 deletions ansible/roles/ninja/tasks/main.yml

This file was deleted.