From df22010e4f6098cf0df841214fb4cd1b5bc4b8d5 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 21 Oct 2022 20:00:08 +0200
Subject: [PATCH] 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
---
 playbooks/build.yaml     | 4 ++--
 playbooks/setup-env.yaml | 2 +-
 playbooks/unit-test.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/build.yaml b/playbooks/build.yaml
index 1866084..dd2f8fb 100644
--- a/playbooks/build.yaml
+++ b/playbooks/build.yaml
@@ -1,12 +1,12 @@
 - name: Build Toolbox
-  command: ninja -C builddir
+  command: meson compile -C builddir
   args:
     chdir: '{{ zuul.project.src_dir }}'
     creates: builddir/src/toolbox
 
 - name: Install Toolbox
   become: yes
-  command: ninja -C builddir install
+  command: meson install -C builddir
   args:
     chdir: '{{ zuul.project.src_dir }}'
     creates: /usr/local/bin/toolbox
diff --git a/playbooks/setup-env.yaml b/playbooks/setup-env.yaml
index e51e0b0..08530ca 100644
--- a/playbooks/setup-env.yaml
+++ b/playbooks/setup-env.yaml
@@ -4,7 +4,7 @@
     - include_tasks: dependencies.yaml
 
     - name: Set up build directory
-      command: meson --fatal-meson-warnings builddir
+      command: meson setup --fatal-meson-warnings builddir
       args:
         chdir: '{{ zuul.project.src_dir }}'
 
diff --git a/playbooks/unit-test.yaml b/playbooks/unit-test.yaml
index 2212521..8659e1a 100644
--- a/playbooks/unit-test.yaml
+++ b/playbooks/unit-test.yaml
@@ -2,6 +2,6 @@
 - hosts: all
   tasks:
     - name: Test
-      command: ninja -C builddir test
+      command: meson test -C builddir
       args:
         chdir: '{{ zuul.project.src_dir }}'