From 7552ed51f78ca1ad311228f76e90cf8c120ee2f6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 4 Oct 2023 14:52:51 +0200
Subject: Adding upstream version 2.6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/appimage.yml | 40 ++++++++++++------------------
 .github/workflows/build.yml    | 55 +++++++++++++++---------------------------
 .github/workflows/coverage.yml | 21 ++++++++++++++++
 .github/workflows/release.yml  |  2 +-
 4 files changed, 56 insertions(+), 62 deletions(-)
 create mode 100644 .github/workflows/coverage.yml

(limited to '.github')

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index f7b7ae0..526c879 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -13,32 +13,22 @@ jobs:
   build-appimage:
     name: build AppImage
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/igaw/linux-nvme/debian:latest
     steps:
-      - uses: actions/checkout@v3
-      - name: install dependencies
-        run: sudo apt-get install libjson-c-dev libssl-dev libdbus-1-dev libhugetlbfs-dev
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - uses: BSFishy/meson-build@v1.0.3
-        with:
-          setup-options: >
-            --werror
-            --buildtype=release
-            --prefix=/usr
-            --force-fallback-for=libnvme
-            -Dlibnvme:werror=false
-          action: install
-          meson-version: 0.61.2
-      - name: build AppImage
-        uses: AppImageCrafters/build-appimage@v1.3
-        with:
-          recipe: .github/AppImageBuilder.yml
-      - uses: actions/upload-artifact@v3
-        name: upload artifacts to github
-        with:
-          name: AppImage
-          path: '*.AppImage*'
+     - uses: actions/checkout@v4
+     - name: build
+       run: |
+         scripts/build.sh appimage
+     - name: build AppImage
+       uses: AppImageCrafters/build-appimage@v1.3
+       with:
+         recipe: .github/AppImageBuilder.yml
+     - uses: actions/upload-artifact@v3
+       name: upload artifacts to github
+       with:
+         name: AppImage
+         path: '*.AppImage*'
 
   deploy-appimage:
     name: deploy AppImage
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3e2fd4..9903645 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,12 +17,9 @@ jobs:
         compiler: [gcc, clang]
         buildtype: [debug, release]
     container:
-      image: ghcr.io/igaw/linux-nvme/debian:0.30
+      image: ghcr.io/igaw/linux-nvme/debian.python:latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+      - uses: actions/checkout@v4
       - name: build
         run: |
           scripts/build.sh -b ${{ matrix.buildtype }} -c ${{ matrix.compiler }}
@@ -40,33 +37,22 @@ jobs:
       matrix:
         include:
           - arch: armhf
-            port: armhf
-            compiler: gcc-arm-linux-gnueabihf
-            packages:
           - arch: s390x
-            port: s390x
-            compiler: gcc-s390x-linux-gnu
-            packages: libgcc-s1:s390x
           - arch: ppc64le
-            port: ppc64el
-            compiler: gcc-powerpc64le-linux-gnu
-            packges:
     steps:
-      - uses: actions/checkout@v3
-      - name: set up arm architecture
-        run: |
-          export release=$(lsb_release -c -s)
-          sudo dpkg --add-architecture ${{ matrix.port }}
-          sudo sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
-          sudo dd of=/etc/apt/sources.list.d/${{ matrix.arch }}.list <<EOF
-          deb [arch=${{ matrix.port }}] http://ports.ubuntu.com/ $release main universe restricted"
-          deb [arch=${{ matrix.port }}] http://ports.ubuntu.com/ $release-updates main universe restricted"
-          EOF
-          sudo apt update
-          sudo apt install -y meson pkg-config qemu-user-static ${{ matrix.compiler}} libjson-c-dev:${{ matrix.port }} ${{ matrix.packages }}
-      - name: build
-        run: |
-          scripts/build.sh -b release -c gcc -t ${{ matrix.arch }} cross
+      - uses: actions/checkout@v4
+      - name: enable foreign arch
+        uses: dbhi/qus/action@main
+      - name: compile and run unit tests
+        uses: mosteo-actions/docker-run@v1
+        with:
+          image: ghcr.io/igaw/linux-nvme/ubuntu-cross-${{ matrix.arch }}:latest
+          guest-dir: /build
+          host-dir: ${{ github.workspace }}
+          command: |
+            scripts/build.sh -b release -c gcc -t ${{ matrix.arch }} cross
+          params: "--platform linux/amd64"
+          pull-params: "--platform linux/amd64"
       - uses: actions/upload-artifact@v3
         name: upload logs
         if: failure()
@@ -79,13 +65,10 @@ jobs:
     name: fallback shared libraries
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/igaw/linux-nvme/debian:0.30
+      image: ghcr.io/igaw/linux-nvme/debian:latest
     if: github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+      - uses: actions/checkout@v4
       - name: build
         run: |
           scripts/build.sh -b release -c gcc fallback
@@ -100,9 +83,9 @@ jobs:
     name: muon minimal static
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/igaw/linux-nvme/debian:0.30
+      image: ghcr.io/igaw/linux-nvme/debian:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: build
         run: |
           scripts/build.sh -m muon
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 0000000..39ea739
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,21 @@
+---
+name: coverage
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  code-coverage:
+    name: code coverage
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/igaw/linux-nvme/debian.python:latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: build
+        run: |
+          scripts/build.sh coverage
+      - uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c88be9e..8259480 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-- 
cgit v1.2.3