diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daa55d938..594945c62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,7 @@ jobs: # no expect because stdout seems to be redirected packages: "libcmocka-dev shunit2", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "Release, clang", @@ -39,8 +38,7 @@ jobs: packager: "sudo apt-get", packages: "libcmocka-dev shunit2", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "Debug, gcc", @@ -51,8 +49,7 @@ jobs: packager: "sudo apt-get", packages: "libcmocka-dev valgrind shunit2", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "Debug, clang", @@ -64,8 +61,7 @@ jobs: # no valgrind because it does not support DWARF5 yet generated by clang 14 packages: "libcmocka-dev shunit2", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "Release, macOS 11, clang", @@ -76,8 +72,7 @@ jobs: packager: "brew", packages: "cmocka shunit2", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "ASAN and UBSAN", @@ -88,8 +83,7 @@ jobs: packager: "sudo apt-get", packages: "libcmocka-dev", snaps: "", - make-prepend: "", - make-target: "" + build-cmd: "make" } - { name: "ABI Check", @@ -100,12 +94,22 @@ jobs: packager: "sudo apt-get", packages: "libcmocka-dev abi-dumper abi-compliance-checker", snaps: "core universal-ctags", - make-prepend: "", - make-target: "abi-check" + build-cmd: "make abi-check" + } + - { + name: "DEB Package", + os: "ubuntu-22.04", + build-type: "Release", + cc: "gcc", + options: "", + packager: "sudo apt-get", + packages: "python3-pip", + snaps: "", + build-cmd: "pip install apkg && apkg system-setup && apkg build && apkg install" } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@main - name: Deps-packages shell: bash @@ -138,6 +142,7 @@ jobs: mkdir build cd build CC=${{ matrix.config.cc }} cmake -DCMAKE_BUILD_TYPE=${{ matrix.config.build-type }} ${{ matrix.config.options }} .. + if: ${{ matrix.config.name != 'DEB Package' }} - name: Build shell: bash @@ -145,7 +150,7 @@ jobs: run: | export LC_ALL=C.UTF-8 export PATH=/snap/bin:${{ github.workspace }}/coverity-tools/bin:$PATH - ${{ matrix.config.make-prepend }} make ${{ matrix.config.make-target }} + ${{ matrix.config.build-cmd }} - name: Test shell: bash