playbooks: Use the same commands as mentioned in the documentation

... at https://containertoolbx.org/install/

There are some minor benefits to always invoking meson(1), as opposed to
directly invoking the underlying build backend, like 'ninja'.

It's one less command to be aware of.  Secondly, in theory, Meson can be
used with backends other than Ninja (see 'meson configure'), even though
Ninja is the most likely option for building Toolbx because it's only
supported on Linux.

https://github.com/containers/toolbox/pull/1142
This commit is contained in:
Debarshi Ray 2022-10-21 20:00:08 +02:00
parent 8b2d25f1e8
commit df22010e4f
3 changed files with 4 additions and 4 deletions

View file

@ -1,12 +1,12 @@
- name: Build Toolbox - name: Build Toolbox
command: ninja -C builddir command: meson compile -C builddir
args: args:
chdir: '{{ zuul.project.src_dir }}' chdir: '{{ zuul.project.src_dir }}'
creates: builddir/src/toolbox creates: builddir/src/toolbox
- name: Install Toolbox - name: Install Toolbox
become: yes become: yes
command: ninja -C builddir install command: meson install -C builddir
args: args:
chdir: '{{ zuul.project.src_dir }}' chdir: '{{ zuul.project.src_dir }}'
creates: /usr/local/bin/toolbox creates: /usr/local/bin/toolbox

View file

@ -4,7 +4,7 @@
- include_tasks: dependencies.yaml - include_tasks: dependencies.yaml
- name: Set up build directory - name: Set up build directory
command: meson --fatal-meson-warnings builddir command: meson setup --fatal-meson-warnings builddir
args: args:
chdir: '{{ zuul.project.src_dir }}' chdir: '{{ zuul.project.src_dir }}'

View file

@ -2,6 +2,6 @@
- hosts: all - hosts: all
tasks: tasks:
- name: Test - name: Test
command: ninja -C builddir test command: meson test -C builddir
args: args:
chdir: '{{ zuul.project.src_dir }}' chdir: '{{ zuul.project.src_dir }}'