From 7987aeed8f342533d6fbae380747f91007f4d775 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Sun, 14 Jul 2024 01:17:22 +0200 Subject: [PATCH 1/3] update llvm version in flatak manifest files --- build-aux/org.kuchelmeister.ToolboxTuner.Devel.json | 2 +- build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json | 2 +- build-aux/org.kuchelmeister.ToolboxTuner.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json b/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json index 49c84b4..145d354 100644 --- 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" : [ diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json b/build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json index fe6bf17..457aa70 100644 --- 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" : [ diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.json b/build-aux/org.kuchelmeister.ToolboxTuner.json index 982002a..3829768 100644 --- 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" : [ From 0412bcd0f84504a0fc6729a802467a9c2ef41647 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister <13hannes11@users.noreply.github.com> Date: Tue, 16 Jul 2024 00:00:15 +0200 Subject: [PATCH 2/3] align build options in with flathub manifest and remove env options and other parameters causing issues --- build-aux/org.kuchelmeister.ToolboxTuner.Devel.json | 10 +--------- .../org.kuchelmeister.ToolboxTuner.Screenshot.json | 10 +--------- build-aux/org.kuchelmeister.ToolboxTuner.json | 10 +--------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json b/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json index 145d354..1494e6f 100644 --- a/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json +++ b/build-aux/org.kuchelmeister.ToolboxTuner.Devel.json @@ -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 index 457aa70..e4f773d 100644 --- a/build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json +++ b/build-aux/org.kuchelmeister.ToolboxTuner.Screenshot.json @@ -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 index 3829768..5518ed7 100644 --- a/build-aux/org.kuchelmeister.ToolboxTuner.json +++ b/build-aux/org.kuchelmeister.ToolboxTuner.json @@ -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" From e9a142808469cdc81cc903df7a330e00b2edfbd0 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister <13hannes11@users.noreply.github.com> Date: Tue, 16 Jul 2024 07:57:59 +0200 Subject: [PATCH 3/3] Add building of all flatpak manifest targets (closes #48) --- .github/workflows/pre-release.yml | 60 ++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index cbba694..82b7e21 100644 --- 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/flatpak-builder@v6.3 with: - bundle: toolboxtuner.flatpak - manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json + bundle: toolboxtuner-release.flatpak + manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.json run-tests: true - cache-key: flatpak-builder-${{ github.sha }} + cache-key: flatpak-builder-release-${{ github.sha }} upload-artifact: false - uses: actions/upload-artifact@v4 with: - name: flatpak + 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/flatpak-builder@v6.3 + 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/flatpak-builder@v6.3 + with: + bundle: toolboxtuner-dev.flatpak + manifest-path: build-aux/org.kuchelmeister.ToolboxTuner.Devel.json + run-tests: true + cache-key: flatpak-builder-dev-${{ github.sha }} + upload-artifact: false + - uses: actions/upload-artifact@v4 + with: + 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