playbooks: Properly separate builddir setup & build

Call "meson builddir" makes Meson create a build directory called
"builddir". It does not make it build the project. A subsequent call to
"meson compile" or "ninja" needs to be made. This subtle detail causes
a minor (purely visual) discrepancy in the CI output. Fix this for both
unit-test & system-test job definitions.
This commit is contained in:
Ondřej Míchal 2021-03-21 22:34:08 +01:00
parent b91a93044b
commit 424691b404
2 changed files with 14 additions and 3 deletions

View file

@ -5,13 +5,18 @@
toolbox_bin: '/usr/local/bin/toolbox'
tasks:
- name: Build toolbox
- name: Set up build directory
command: meson builddir
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Build Toolbox
command: ninja -C builddir
args:
chdir: '{{ zuul.project.src_dir }}'
creates: builddir/src/toolbox
- name: Install toolbox
- name: Install Toolbox
become: yes
command: ninja -C builddir install
args:

View file

@ -11,11 +11,17 @@
- meson
- ShellCheck
- name: Build
- name: Set up build directory
command: meson builddir
args:
chdir: '{{ zuul.project.src_dir }}'
- name: Build Toolbox
command: ninja -C builddir
args:
chdir: '{{ zuul.project.src_dir }}'
creates: builddir/src/toolbox
- name: Test
command: ninja -C builddir test
args: