build for ubuntu nobel

cppfw · Jul 15, 2024 · 36a0b03 · 36a0b03
1 parent ea86da8
commit 36a0b03
Showing 1 changed file with 18 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,31 +16,25 @@ jobs:
 ##### coverage #####
   coverage:
     runs-on: ubuntu-latest
-    container: debian:bullseye
+    container: debian:bookworm
     name: coverage - measure
     env:
       linux_distro: debian
-      linux_release: bullseye
+      linux_release: bookworm
     steps:
       - name: add cppfw deb repo
         uses: myci-actions/add-deb-repo@master
         with:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-          install: myci locales git
+          install: myci locales git pipx
       - name: add llvm repo (for clang-format)
         uses: myci-actions/add-deb-repo@master
         with:
           repo: deb http://apt.llvm.org/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
           repo-name: llvm
           keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
-      - name: install ci tools
-        run: |
-          apt --quiet install --assume-yes devscripts equivs lcov python3-pip
-
-          # install gcovr >5.2
-          pip install git+https://github.com/gcovr/gcovr.git
       - name: git clone
         uses: myci-actions/checkout@master
       - name: prepare debian package
@@ -57,9 +51,9 @@ jobs:
       - name: test
         run: make config=gcov test
       - name: generate coverage report
-        run: gcovr --gcov-ignore-parse-errors --exclude-throw-branches --filter src/ --cobertura > cobertura.xml
+        run: pipx gcovr --gcov-ignore-parse-errors --exclude-throw-branches --filter src/ --cobertura > cobertura.xml
       - name: upload coverage report to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cobertura.xml
           path: cobertura.xml
@@ -79,11 +73,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: debian, codename: bullseye, image_owner: }
-          - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: }
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-    name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
+    name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
     steps:
       - name: add cppfw deb repo
         uses: myci-actions/add-deb-repo@master
@@ -119,23 +113,24 @@ jobs:
         include:
           # - {os: debian, codename: buster, image_owner: }
           # - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
-          # - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm,docker]}
+          # - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bullseye, image_owner: }
           # - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
-          - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
           - {os: debian, codename: bookworm, image_owner: }
           # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
-          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
           - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
           - {os: ubuntu, codename: focal, image_owner: }
           - {os: ubuntu, codename: jammy, image_owner: }
-          # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm,docker]}
-          - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm,docker]}
-          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm,docker]}
+          - {os: ubuntu, codename: nobel, image_owner: }
+          # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
+          # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
+          - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-    name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
+    name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
     steps:
       - name: set TZ for ubuntu:focal
         run: |
@@ -183,7 +178,7 @@ jobs:
       matrix:
         include:
           - {image: "archlinux:latest", arch: amd64}
-          # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm,docker]}
+          # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]}
           - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image }}
@@ -428,7 +423,7 @@ jobs:
           - {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
           # - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
           # - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
-          # - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm,docker]}
+          # - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm32,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: conan - linux - ${{ matrix.arch }}