Skip to content

Commit d50d714

Browse files
Merge pull request #475 from martin-belanger/fix-workflows
ci: replace BSFishy/meson-build with plain run steps
2 parents 165a42a + b934cff commit d50d714

3 files changed

Lines changed: 15 additions & 23 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,21 @@ jobs:
4242
sudo apt-get install --yes --quiet swig libjson-c-dev
4343
4444
- name: "INIT: CodeQL"
45-
uses: github/codeql-action/init@v3
45+
uses: github/codeql-action/init@v4
4646
with:
4747
languages: python
4848
config-file: ./.github/codeql/codeql-config.yml
4949

5050
- name: "BUILD: [libnvme, nvme-stas] (generates configured files in .build/)"
51-
uses: BSFishy/[email protected]
52-
with:
53-
action: build
54-
directory: .build
55-
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
51+
run: |
52+
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
53+
meson compile -C .build
5654
5755
- name: "CONFIG: PYTHONPATH"
5856
run: |
5957
echo "PYTHONPATH=.build:.build/subprojects/nvme-cli/libnvme:/usr/lib/python3/dist-packages/" >> $GITHUB_ENV
6058
6159
- name: "ANALYZE: CodeQL"
62-
uses: github/codeql-action/analyze@v3
60+
uses: github/codeql-action/analyze@v4
6361
with:
6462
category: "/language:python"

.github/workflows/linters.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ jobs:
4848
pip install meson==0.62.0 ruff
4949
5050
- name: "BUILD: [libnvme, nvme-stas]"
51-
uses: BSFishy/[email protected]
52-
with:
53-
action: build
54-
directory: .build
55-
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
51+
run: |
52+
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
53+
meson compile -C .build
5654
5755
- name: Set PYTHONPATH
5856
run: |
@@ -102,11 +100,9 @@ jobs:
102100
pip install ruff
103101
104102
- name: "BUILD: [libnvme, nvme-stas]"
105-
uses: BSFishy/[email protected]
106-
with:
107-
action: build
108-
directory: .build
109-
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
103+
run: |
104+
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
105+
meson compile -C .build
110106
111107
- name: Set PYTHONPATH
112108
run: |

.github/workflows/meson-test.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ jobs:
4545
echo "PYTHONPATH=.build:.build/subprojects/nvme-cli/libnvme:/usr/lib/python3/dist-packages/" >> $GITHUB_ENV
4646
4747
- name: "TEST: nvme-stas"
48-
uses: BSFishy/[email protected]
49-
with:
50-
action: test
51-
directory: .build
52-
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
53-
options: --print-errorlogs --suite nvme-stas
48+
run: |
49+
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
50+
meson compile -C .build
51+
meson test -C .build --print-errorlogs --suite nvme-stas
5452
5553
# Preserve meson's log file on failure
5654
- uses: actions/upload-artifact@v7

0 commit comments

Comments
 (0)