Merge pull request #50 from 13hannes11/49-add-multi-architecture-build

Add multiarchitecutre build

.github/workflows/pre-release.yml

@@ -8,25 +8,46 @@ name: build-and-prerelease
 
 jobs:
   flatpak:
-    name: Flatpak-prerelease
+    name: "Flatpak"
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-46
       options: --privileged
+    strategy:
+      matrix:
+        target: [ToolboxTuner, ToolboxTuner.Devel, ToolboxTuner.Screenshot]
+        arch: [x86_64]
+        include:
+        - target: ToolboxTuner.Devel
+          arch: aarch64
+        # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
     steps:
     - uses: actions/checkout@v4
       with:
         lfs: true
+    # Docker is required by the docker/setup-qemu-action which enables emulation
+    - name: Install deps
+      if: ${{ matrix.arch != 'x86_64' }}
+      run: |
+        dnf -y install docker
+    - name: Set up QEMU
+      if: ${{ matrix.arch != 'x86_64' }}
+      id: qemu
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: arm64
     - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6.3
       with:
-        bundle: toolboxtuner.flatpak
-        manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json
+        bundle: ${{ matrix.target }}.${{ matrix.arch }}.flatpak
+        manifest-path: build-aux/org.kuchelmeister.${{ matrix.target }}.json
         run-tests: true
         cache-key: flatpak-builder-${{ github.sha }}
         upload-artifact: false
+        arch: ${{ matrix.arch }}
     - uses: actions/upload-artifact@v4
       with:
-        name: flatpak
+        name: flatpak-release-${{ matrix.target }}-${{ matrix.arch }}
         path: |
           *.flatpak
   vendor:
@@ -61,7 +82,7 @@ jobs:
         automatic_release_tag: dev
         title: 'Latest Development Build'
         files: |
-          **/*.flatpak
+          **/*.Devel.*.flatpak
           **/*.tar.gz
           **/*.sha256sum
 

build-aux/org.kuchelmeister.ToolboxTuner.Devel.json

@@ -5,7 +5,7 @@
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm15"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command" : "toolbox-tuner",
     "finish-args" : [
@@ -19,18 +19,10 @@
         "--share=ipc"
     ],
     "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm15/bin",
-        "prepend-ld-library-path" : "/usr/lib/sdk/llvm15/lib",
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
         "build-args" : [
             "--share=network"
         ],
-        "env" : {
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse",
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
-        },
         "test-args" : [
             "--socket=x11",
             "--share=network"

build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json

@@ -5,7 +5,7 @@
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm15"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command" : "toolbox-tuner",
     "finish-args" : [
@@ -19,18 +19,10 @@
         "--share=ipc"
     ],
     "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm15/bin",
-        "prepend-ld-library-path" : "/usr/lib/sdk/llvm15/lib",
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
         "build-args" : [
             "--share=network"
         ],
-        "env" : {
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse",
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
-        },
         "test-args" : [
             "--socket=x11",
             "--share=network"

build-aux/org.kuchelmeister.ToolboxTuner.json

@@ -5,7 +5,7 @@
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm15"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command" : "toolbox-tuner",
     "finish-args" : [
@@ -16,18 +16,10 @@
         "--talk-name=org.freedesktop.Flatpak"
     ],
     "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm15/bin",
-        "prepend-ld-library-path" : "/usr/lib/sdk/llvm15/lib",
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
         "build-args" : [
             "--share=network"
         ],
-        "env" : {
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL" : "sparse",
-            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang",
-            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
-        },
         "test-args" : [
             "--socket=x11",
             "--share=network"