imfreedom/ansible

update openbsd to install meson via pip and integrate the debian meson pip install into debian.yml

2021-07-29, Gary Kramlich
830f6efe189e
Parents 6a3873c78bea
Children 885aaba6c231
update openbsd to install meson via pip and integrate the debian meson pip install into debian.yml
3 files changed, 16 insertions(+), 11 deletions(-)
  • +7 -3
    roles/meson/tasks/debian.yml
  • +9 -1
    roles/meson/tasks/openbsd.yml
  • +0 -7
    roles/meson/tasks/pip.yml
    • --- a/roles/meson/tasks/debian.yml Thu Jul 29 22:05:21 2021 -0500
    +++ b/roles/meson/tasks/debian.yml Thu Jul 29 23:22:12 2021 -0500
    @@ -19,10 +19,14 @@
    state: present
    force_apt_get: true
    when: meson_install_from_pip|bool
    -- include_tasks: pip.yml
    +- name: install meson from pip
    + pip:
    + name:
    + - meson
    + executable: pip3
    + state: latest
    when: meson_install_from_pip|bool
    -
    -- name: install
    +- name: install meson from apt
    apt:
    name:
    - meson
    --- a/roles/meson/tasks/openbsd.yml Thu Jul 29 22:05:21 2021 -0500
    +++ b/roles/meson/tasks/openbsd.yml Thu Jul 29 23:22:12 2021 -0500
    @@ -3,5 +3,13 @@
    openbsd_pkg:
    name: meson
    state: absent
    -- include_tasks: pip.yml
    +- name: install pip3 from pkg
    + openbsd_pkg:
    + name: py3-pip
    +- name: install meson from pip
    + pip:
    + name:
    + - meson
    + state: latest
    + executable: pip3.8
    --- a/roles/meson/tasks/pip.yml Thu Jul 29 22:05:21 2021 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,7 +0,0 @@
    ----
    -- name: install meson from pip
    - pip:
    - name:
    - - meson
    - executable: pip3
    -