From 0d74fbb3e69614d36d6cb9618459d9e2c3b826fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Sun, 9 Oct 2022 13:39:24 +0200 Subject: [PATCH 1/4] workflow: Update Flatpak nightly to 22.08 --- .github/workflows/flatpak-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index 02d661a5..ce7630c0 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -29,8 +29,8 @@ jobs: platforms: arm64 - name: Prepare Runtime run: | - flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-nightly/${{ matrix.arch }}/21.08 - flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm13/${{ matrix.arch }}/21.08 + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-nightly/${{ matrix.arch }}/22.08 + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm14/${{ matrix.arch }}/22.08 - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 name: Build with: From ff5091e7d39864945a38567bf358fa19bcac5677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Sun, 9 Oct 2022 15:00:22 +0200 Subject: [PATCH 2/4] flatpak-nightly: Update to llvm14 --- pkgs/flatpak/com.github.rafostar.Clapper-nightly.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index 861518b6..e241655d 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json @@ -5,7 +5,7 @@ "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-nightly", - "org.freedesktop.Sdk.Extension.llvm13" + "org.freedesktop.Sdk.Extension.llvm14" ], "command": "com.github.rafostar.Clapper", "finish-args": [ @@ -25,8 +25,8 @@ "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0" ], "build-options": { - "append-path": "/usr/lib/sdk/rust-nightly/bin:/usr/lib/sdk/llvm13/bin", - "prepend-ld-library-path": "/usr/lib/sdk/llvm13/lib" + "append-path": "/usr/lib/sdk/rust-nightly/bin:/usr/lib/sdk/llvm14/bin", + "prepend-ld-library-path": "/usr/lib/sdk/llvm14/lib" }, "modules": [ "flathub/shared-modules/gudev/gudev.json", From 301e1f2ade14290c8ddc766fb121c862e894d344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Sun, 9 Oct 2022 20:17:56 +0200 Subject: [PATCH 3/4] flatpak-nightly: Skip compiling libadwaita Nightly has now newer version, so we do not need to build it ourselves anymore --- pkgs/flatpak/com.github.rafostar.Clapper-nightly.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index e241655d..12150f27 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json @@ -30,9 +30,6 @@ }, "modules": [ "flathub/shared-modules/gudev/gudev.json", - "flathub/lib/libsass.json", - "flathub/lib/sassc.json", - "flathub/lib/libadwaita.json", "flathub/lib/liba52.json", "flathub/lib/libmpeg2.json", "flathub/lib/libdv.json", From 845de1db8b63deeb39811748e7aea4b3caa4387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Mon, 10 Oct 2022 18:06:32 +0200 Subject: [PATCH 4/4] flatpak-nightly: Only build GStreamer Rust plugins on x64 We are no longer able to build them on aarch64, as CI either runs out of memory or time limit --- pkgs/flatpak/testing/gst-plugins-rs.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/flatpak/testing/gst-plugins-rs.json b/pkgs/flatpak/testing/gst-plugins-rs.json index d4430b51..b770cfd3 100644 --- a/pkgs/flatpak/testing/gst-plugins-rs.json +++ b/pkgs/flatpak/testing/gst-plugins-rs.json @@ -1,6 +1,9 @@ { "name": "gst-plugins-rs", "buildsystem": "simple", + "only-arches": [ + "x86_64" + ], "build-options": { "build-args": [ "--share=network"