From 0fb4e8b64033a4ba5b0a92cb798120389b650834 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 15 Sep 2026 19:49:21 +0100 Subject: [PATCH 1/3] CI: Use `meson setup $builddir` instead of deprecated `meson $builddir` Signed-off-by: Simon McVittie --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8a747d52..a55a6932 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -23,7 +23,7 @@ jobs: run: mkdir test-logs - name: setup run: | - meson _build + meson setup _build env: CFLAGS: >- -O2 @@ -94,7 +94,7 @@ jobs: uses: actions/checkout@v4 - name: Install build-dependencies run: sudo ./ci/builddeps.sh --clang - - run: meson build -Dselinux=enabled + - run: meson setup build -Dselinux=enabled env: CC: clang CFLAGS: >- From ad225f668c6ce84e091b182306a531005e8079b6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 15 Sep 2026 19:52:54 +0100 Subject: [PATCH 2/3] CI: Convert CFLAGS into Meson built-in options where possible Signed-off-by: Simon McVittie --- .github/workflows/check.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a55a6932..a4411e2f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -23,13 +23,10 @@ jobs: run: mkdir test-logs - name: setup run: | - meson setup _build + meson setup _build -Db_sanitize=address,undefined -Doptimization=2 env: CFLAGS: >- - -O2 -Wp,-D_FORTIFY_SOURCE=2 - -fsanitize=address - -fsanitize=undefined - name: compile run: ninja -C _build -v - name: smoke-test @@ -94,11 +91,10 @@ jobs: uses: actions/checkout@v4 - name: Install build-dependencies run: sudo ./ci/builddeps.sh --clang - - run: meson setup build -Dselinux=enabled + - run: meson setup build -Doptimization=2 -Dselinux=enabled env: CC: clang CFLAGS: >- - -O2 -Werror=unused-variable - run: meson compile -C build - name: CodeQL analysis From 75e2c8c3ce7d37d66ee5ce04fc23fa9b7bd03948 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 16 Sep 2026 15:54:40 +0100 Subject: [PATCH 3/3] README: Replace `meson $builddir` with `meson setup $builddir` here, too Signed-off-by: Simon McVittie --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18d0becf..69addd6f 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ and can be installed from there. If you need to build bubblewrap from source, you can do this with meson: ```sh -meson _builddir +meson setup _builddir meson compile -C _builddir meson test -C _builddir meson install -C _builddir