Merge branch 'master' into master

Author: Owen-kaiqi

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  default:
+  nvme-cli:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -33,6 +33,29 @@ jobs:
           path: |
             .build-ci/meson-logs/*.txt
 
+  libnvme:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: [gcc, clang]
+        buildtype: [debug, release]
+    container:
+      image: ghcr.io/linux-nvme/debian.python:latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Mark repo as safe for git
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: build
+        run: |
+          scripts/build.sh -b ${{ matrix.buildtype }} -c ${{ matrix.compiler }} -x libnvme
+      - uses: actions/upload-artifact@v5
+        name: upload logs
+        if: failure()
+        with:
+          name: libnvme logs files
+          path: |
+            .build-ci/meson-logs/*.txt
+
   cross:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/libnvme-build.yml

@@ -21,4 +21,5 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: build
         run: |
-          libnvme/scripts/build.sh docs
+          scripts/build.sh docs
+#          libnvme/scripts/build.sh docs

.github/workflows/libnvme-docs.yaml

@@ -67,9 +67,9 @@ jobs:
           echo "dev_version=$VERSION" >> $GITHUB_OUTPUT
           echo "Computed dev version: $VERSION"
 
-      - name: Patch version in meson.build
+      - name: Patch project version in meson.build
         run: |
-          sed -i -e "0,/[ \t]version: /s/\([ \t]version: \).*/\1\'${{ steps.version.outputs.dev_version }}\',/" meson.build
+          sed -i -e "/^project(/,/)/ s/^\(\s*\)version:\s*.*/\1version: '${{ steps.version.outputs.dev_version }}',/" meson.build
 
       - name: Build sdist
         run: |
@@ -93,7 +93,7 @@ jobs:
     environment: pypi
     permissions:
       id-token: write
-    if: github.repository == 'linux-nvme/libnvme'
+    if: github.repository == 'linux-nvme/nvme-cli'
     steps:
       - uses: actions/download-artifact@v6
         with:
@@ -113,7 +113,7 @@ jobs:
     environment: pypi
     permissions:
       id-token: write
-    if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'linux-nvme/libnvme'
+    if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'linux-nvme/nvme-cli'
     steps:
       - name: Check if it is a release tag
         id: check-tag

.github/workflows/libnvme-release-python.yml

@@ -17,4 +17,5 @@ tests/nvmetests
 tests/*.pyc
 
 .build
+.build-ci
 .cache

.gitignore

@@ -16,8 +16,8 @@ build:
     post_install:
       - pip3 install lxml
     pre_build:
-      - meson setup .build -Ddocs=rst -Ddocs-build=true || cat .build/meson-logs/meson-log.txt
+      - meson setup .build -Ddocs=rst -Ddocs-build=true -Dnvme=disabled -Dlibnvme=disabled -Dpython=disabled || cat .build/meson-logs/meson-log.txt
       - meson compile -C .build
 
 sphinx:
-  configuration: .build/doc/conf.py
+  configuration: .build/libnvme/doc/conf.py