Merge pull request #46 from 13hannes11/feature/update-llvm-version

Update llvm version in flatak manifest files
13hannes11 · Jul 16, 2024 · 7fa5e2b · 7fa5e2b
2 parents 052fd33 + e9a1428
commit 7fa5e2b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 37 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -7,8 +7,8 @@ on:
 name: build-and-prerelease
 
 jobs:
-  flatpak:
-    name: Flatpak-prerelease
+  flatpak-release-target:
+    name: build-flatpak-release-target
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-46
@@ -19,14 +19,58 @@ jobs:
         lfs: true
     - uses: bilelmoussaoui/flatpak-github-actions/[email protected]
       with:
-        bundle: toolboxtuner.flatpak
+        bundle: toolboxtuner-release.flatpak
+        manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.json
+        run-tests: true
+        cache-key: flatpak-builder-release-${{ github.sha }}
+        upload-artifact: false
+    - uses: actions/upload-artifact@v4
+      with:
+        name: flatpak-release
+        path: |
+          *.flatpak
+  flatpak-screenshot-target:
+    name: build-flatpak-screenshot-target
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        lfs: true
+    - uses: bilelmoussaoui/flatpak-github-actions/[email protected]
+      with:
+        bundle: toolboxtuner-screenshot.flatpak
+        manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json
+        run-tests: true
+        cache-key: flatpak-builder-screenshot-${{ github.sha }}
+        upload-artifact: false
+    - uses: actions/upload-artifact@v4
+      with:
+        name: flatpak-screenshot
+        path: |
+          *.flatpak
+  flatpak-dev-target:
+    name: build-flatpak-dev-target
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        lfs: true
+    - uses: bilelmoussaoui/flatpak-github-actions/[email protected]
+      with:
+        bundle: toolboxtuner-dev.flatpak
         manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json
         run-tests: true
-        cache-key: flatpak-builder-${{ github.sha }}
+        cache-key: flatpak-builder-dev-${{ github.sha }}
         upload-artifact: false
     - uses: actions/upload-artifact@v4
       with:
-        name: flatpak
+        name: flatpak-dev
         path: |
           *.flatpak
   vendor:
@@ -47,7 +91,7 @@ jobs:
           *.sha256sum
   publish-prerelease:
     name: publish-prerelease
-    needs: [flatpak, vendor]
+    needs: [flatpak-dev-target, vendor]
     runs-on: ubuntu-latest
     if: startsWith(github.ref_name, 'main') && github.ref_type == 'branch'
     steps:
@@ -61,7 +105,7 @@ jobs:
         automatic_release_tag: dev
         title: 'Latest Development Build'
         files: |
-          **/*.flatpak
+          **/*-dev.flatpak
           **/*.tar.gz
           **/*.sha256sum
 

diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json b/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"

diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json b/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"

diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.json b/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"