Add aarch64 packages

.github/workflows/package-silkit.yml

@@ -77,7 +77,7 @@ jobs:
     container:
       image: ghcr.io/vectorgrp/sil-kit-docker-build/sil-kit-ci-packaging-ubuntu-20.04:main
     env:
-      ARTIFACT_NAME: silkit-ubuntu-20.04-deb
+      ARTIFACT_NAME: silkit-ubuntu-20.04-x86_64-deb
 
     steps:
 
@@ -149,7 +149,8 @@ jobs:
           python3 sil-kit-pkg/tests/test_deb.py \
           --package-directory "$PKG_DIR" \
           --test-directory "$TEST_DIR" \
-          --distro ubuntu
+          --distro ubuntu \
+          --distro-version 20
 
       - name: Artifact
         id: artifact
@@ -172,7 +173,7 @@ jobs:
       image: ghcr.io/vectorgrp/sil-kit-docker-build/sil-kit-ci-packaging-fedora-40:main
       options: --privileged
     env:
-      ARTIFACT_NAME: silkit-almalinux-9-rpm
+      ARTIFACT_NAME: silkit-almalinux-9-x86_64.rpm
 
     steps:
 
@@ -237,7 +238,8 @@ jobs:
           python3 sil-kit-pkg/tests/test_deb.py \
           --package-directory "$PKG_DIR" \
           --test-directory "$TEST_DIR" \
-          --distro fedora
+          --distro fedora \
+          --distro-version 40
 
       - name: Artifact
         id: artifact
@@ -248,6 +250,107 @@ jobs:
             ./${{ env.PKG_OUTDIR }}/*.rpm
           retention-days: 1
 
+  package_ubuntu_arm:
+    runs-on: ubuntu-22.04-arm
+    name: Job to build .deb for Ubuntu 22.04+ ARM64 packages
+    needs: get_version
+    env:
+      ARTIFACT_NAME: silkit-ubuntu-22.04-aarch64-deb
+
+    steps:
+
+      - name: Checkout (sil-kit-pkg)
+        uses: actions/checkout@v4
+        with:
+          path: sil-kit-pkg
+
+      - name: Checkout (sil-kit)
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.silkit_source_repo }}
+          submodules: recursive
+          path: sil-kit
+          ref: ${{ inputs.silkit_source_ref }}
+          github-server-url: https://github.com
+
+      - name: Install debhelper
+        run: |
+
+          sudo apt-get install -y \
+              debhelper \
+              dpkg-dev \
+              devscripts \
+              dh-make \
+              zip \
+              cmake \
+              ninja-build
+
+      - name: Build
+        id: build
+        env:
+          DEBFULLNAME: ${{ inputs.debian_fullname }}
+          DEBEMAIL: ${{ inputs.debian_fullname }}
+          CI_RUN: "1"
+          BUILD_SETTINGS: |
+              {
+
+                  "SilKitInfo": {
+                      "url": "sil-kit",
+                      "ref": "",
+                      "recursive": true,
+                      "is_local": true
+                  },
+                  "package_repo_path": "sil-kit-pkg",
+                  "version": {
+                      "major": ${{ needs.get_version.outputs.silkit_major }},
+                      "minor": ${{ needs.get_version.outputs.silkit_minor }},
+                      "patch": ${{ needs.get_version.outputs.silkit_patch }},
+                      "suffix": "${{ needs.get_version.outputs.silkit_suffix }}"
+                  },
+                  "pkgformat": "deb",
+                  "work_dir": "${{ env.PKG_WORKDIR }}",
+                  "keep_temp": true,
+                  "output_dir": "${{ env.PKG_OUTDIR }}",
+                  "platform": "Ubuntu-22.04",
+                  "debuild": {
+                      "args": ["-d", "--prepend-path=/opt/vector/bin"]
+                  }
+              }
+
+        run: |
+          mkdir -p $PKG_WORKDIR
+          mkdir -p $PKG_OUTDIR
+          touch $PKG_WORKDIR/build_cfg.json
+          printf %s $BUILD_SETTINGS  > $PKG_WORKDIR/build_cfg.json
+          python3 sil-kit-pkg/scripts/silkit_linux_packaging.py \
+            --build-cfg $PKG_WORKDIR/build_cfg.json \
+            --verbose
+
+      - name: Test Package
+        id: test
+        env:
+          PKG_DIR: ./${{ env.PKG_OUTDIR }}
+          TEST_DIR: ./sil-kit-pkg/tests/
+        run: |
+          python3 sil-kit-pkg/tests/test_deb.py \
+          --package-directory "$PKG_DIR" \
+          --test-directory "$TEST_DIR" \
+          --distro ubuntu \
+          --distro-version 22
+
+      - name: Artifact
+        id: artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: |
+            ./${{ env.PKG_OUTDIR }}/*.dsc
+            ./${{ env.PKG_OUTDIR }}/*.build*
+            ./${{ env.PKG_OUTDIR }}/*.changes
+            ./${{ env.PKG_OUTDIR }}/*.*deb
+          retention-days: 1
+
+
 
   make-release:
     runs-on: ubuntu-latest

debian/libsilkit-dev.install

@@ -1,3 +1,3 @@
 /usr/lib/*/cmake/*
 /usr/include/*
-usr/lib/x86_64-linux-gnu/libSilKit.so
+usr/lib/*/libSilKit.so

debian/libsilkit5.install

@@ -1 +1 @@
-usr/lib/x86_64-linux-gnu/libSilKit.so.*
+usr/lib/*/libSilKit.so.*

tests/test_deb.py

@@ -24,6 +24,7 @@ def create_arg_parser() -> ArgumentParser:
     ap.add_argument("--package-directory", type=Path, required=True)
     ap.add_argument("--test-directory", type=Path, required=True)
     ap.add_argument("--distro", type=str, required=True)
+    ap.add_argument("--distro-version", type=int, required=True)
     return ap
 
 def install_debs(deb_directory):
@@ -32,7 +33,7 @@ def install_debs(deb_directory):
     print("--------------------------------\n", flush=True)
     debs = deb_directory.glob('*.deb')
     str_args = [str(deb.resolve()) for deb in debs]
-    args = ['apt', 'install', '-y'] + str_args
+    args = ['sudo', 'apt', 'install', '-y'] + str_args
 
     try:
         subprocess.run(args, check=True)
@@ -81,12 +82,13 @@ def close_registry(reg_proc: subprocess.Popen):
     else:
         print("All is fine, exiting gracefully!")
 
-def build_test(test_dir, distro: str):
+def build_test(test_dir, distro: str, distro_version: int):
 
-    cc = "clang-10" if distro.lower() == "ubuntu" else "clang"
-    cxx = "clang++-10" if distro.lower() == "ubuntu" else "clang++"
+    cc = "clang-10" if distro.lower() == "ubuntu" and distro_version < 22 else "clang"
+    cxx = "clang++-10" if distro.lower() == "ubuntu" and distro_version < 22 else "clang++"
 
     print("\nBuild the SilKit Test program")
+    print(f"Using {cc} and {cxx}")
     print("--------------------------------\n", flush=True)
     # Clean the workspace
     subprocess.run(['rm', '-rf', '_build'], cwd=test_dir, check=True)
@@ -130,7 +132,7 @@ def main():
     # Check demo program (compilation/link/execution)
     test_dir = args.test_directory
     build_dir = test_dir / '_build'
-    build_test(test_dir, args.distro)
+    build_test(test_dir, args.distro, args.distro_version)
     registry = run_registry()
     ret_code = 0
     try: