From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 3 Jun 2025 21:46:47 +0000 (+0100)
Subject: ci: use meson bla -C builddir/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=260949d87b37ef4769c549ec71456469798ea593;p=thirdparty%2Fkmod.git

ci: use meson bla -C builddir/

Use builddir/ as indicated in our README, which makes it obvious that
what the argument is. While there, remove a few instances of mkdir/cd -
meson and ninja can handle it themselves.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/362
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 487a45f2..a6b00cde 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -53,9 +53,8 @@ jobs:
 
       - name: Build
         run: |
-          mkdir build && cd build
-          meson setup --native-file ../build-dev.ini ${{ matrix.meson_setup }} . ..
-          meson compile
+          meson setup --native-file build-dev.ini ${{ matrix.meson_setup }} builddir/
+          meson compile -C builddir/
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
@@ -68,7 +67,7 @@ jobs:
         uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0.1
         with:
           patterns: |
-            -build/meson-private/**/testfile.c
+            -builddir/meson-private/**/testfile.c
           input: sarif-results/cpp.sarif
           output: sarif-results/cpp.sarif
 
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index a5ccf108..32beea1c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -44,14 +44,13 @@ jobs:
 
       - name: Build
         run: |
-          mkdir build && cd build
-          meson setup --native-file ../build-dev.ini ${{ matrix.meson_setup }} . ..
-          meson compile
-          meson test
-          ninja coverage-xml
+          meson setup --native-file build-dev.ini ${{ matrix.meson_setup }} builddir/
+          meson compile -C builddir/
+          meson test -C builddir/
+          ninja -C builddir/ coverage-xml
 
       - name: Upload Coverage
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: build/meson-logs/coverage.xml
+          file: builddir/meson-logs/coverage.xml
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0b43c57c..61bcd741 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -29,8 +29,8 @@ jobs:
 
       - name: Build docs
         run: |
-          meson setup -Ddocs=true build .
-          meson compile -C build
+          meson setup -Ddocs=true builddir/
+          meson compile -C builddir/
 
       - name: Extract docs version
         shell: bash
@@ -50,7 +50,7 @@ jobs:
         env:
           API_TOKEN_GITHUB: ${{ secrets.KMOD_DOCS }}
         with:
-          source-directory: 'build/libkmod/docs/html'
+          source-directory: 'builddir/libkmod/docs/html'
           destination-github-username: '${{ github.repository_owner }}'
           destination-repository-name: 'kmod-project.github.io'
           user-name: 'github-actions[bot]'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ab3f3fd4..f8039685 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -173,17 +173,17 @@ jobs:
             export CC_LD="${{ matrix.linker }}"
           fi
 
-          meson setup --native-file build-dev.ini $setup_options build
+          meson setup --native-file build-dev.ini $setup_options builddir/
 
       - name: build
-        run: cd build && meson compile
+        run: meson compile -C builddir/
 
       - name: test
         if: ${{ matrix.skip_test != 'true' }}
-        run: cd build && meson test || meson test --verbose
+        run: meson test -C builddir/ || meson test -C builddir/ --verbose
 
       - name: install
-        run: cd build && DESTDIR=$PWD/inst meson install
+        run: DESTDIR=$PWD/inst meson install -C builddir/
 
       - name: distcheck
-        run: cd build && meson dist
+        run: meson dist -C builddir/