From b934cffd61e09439aa1912838ba7cd23d0c7a9a4 Mon Sep 17 00:00:00 2001 From: Martin Belanger Date: Mon, 6 Apr 2026 14:12:19 -0400 Subject: [PATCH] ci: replace BSFishy/meson-build with plain run steps BSFishy/meson-build@v1.0.3 runs on Node.js 20, which is deprecated in GitHub Actions as of June 2, 2026. Replace it with equivalent meson setup/compile/test run steps in all three workflows (codeql.yml, linters.yml, meson-test.yml). Also upgrade codeql-action from v3 to v4. Signed-off-by: Martin Belanger --- .github/workflows/codeql.yml | 12 +++++------- .github/workflows/linters.yml | 16 ++++++---------- .github/workflows/meson-test.yml | 10 ++++------ 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 198cc42..714b659 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,23 +42,21 @@ jobs: sudo apt-get install --yes --quiet swig libjson-c-dev - name: "INIT: CodeQL" - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: python config-file: ./.github/codeql/codeql-config.yml - name: "BUILD: [libnvme, nvme-stas] (generates configured files in .build/)" - uses: BSFishy/meson-build@v1.0.3 - with: - action: build - directory: .build - setup-options: --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + run: | + meson setup .build --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + meson compile -C .build - name: "CONFIG: PYTHONPATH" run: | echo "PYTHONPATH=.build:.build/subprojects/nvme-cli/libnvme:/usr/lib/python3/dist-packages/" >> $GITHUB_ENV - name: "ANALYZE: CodeQL" - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 with: category: "/language:python" diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 46f0878..bf63a2e 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -48,11 +48,9 @@ jobs: pip install meson==0.62.0 ruff - name: "BUILD: [libnvme, nvme-stas]" - uses: BSFishy/meson-build@v1.0.3 - with: - action: build - directory: .build - setup-options: --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + run: | + meson setup .build --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + meson compile -C .build - name: Set PYTHONPATH run: | @@ -102,11 +100,9 @@ jobs: pip install ruff - name: "BUILD: [libnvme, nvme-stas]" - uses: BSFishy/meson-build@v1.0.3 - with: - action: build - directory: .build - setup-options: --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + run: | + meson setup .build --buildtype=release --sysconfdir=/etc --prefix=/usr -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + meson compile -C .build - name: Set PYTHONPATH run: | diff --git a/.github/workflows/meson-test.yml b/.github/workflows/meson-test.yml index 8b5ee28..4442044 100644 --- a/.github/workflows/meson-test.yml +++ b/.github/workflows/meson-test.yml @@ -45,12 +45,10 @@ jobs: echo "PYTHONPATH=.build:.build/subprojects/nvme-cli/libnvme:/usr/lib/python3/dist-packages/" >> $GITHUB_ENV - name: "TEST: nvme-stas" - uses: BSFishy/meson-build@v1.0.3 - with: - action: test - directory: .build - setup-options: --buildtype=release --sysconfdir=/etc --prefix=/usr -Dman=true -Dhtml=true -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled - options: --print-errorlogs --suite nvme-stas + run: | + meson setup .build --buildtype=release --sysconfdir=/etc --prefix=/usr -Dman=true -Dhtml=true -Dnvme-cli:buildtype=release -Dnvme-cli:sysconfdir=/etc -Dnvme-cli:prefix=/usr -Dnvme-cli:python=enabled -Dnvme-cli:libdbus=disabled -Dnvme-cli:openssl=disabled -Dnvme-cli:json-c=disabled -Dnvme-cli:keyutils=disabled + meson compile -C .build + meson test -C .build --print-errorlogs --suite nvme-stas # Preserve meson's log file on failure - uses: actions/upload-artifact@v7