From ce102b9c76b43075817a854a4d1ebafc50302615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Sun, 19 Jan 2025 17:30:28 +0100
Subject: [PATCH] workflows: Use flatpak-builder action master version

Since "flatpak-builder" action uses deprecated "upload-artifact"
version, that can stop working soon, disable it and upload ourselves.
This is supported in master, but not in any tagged version,
so for now switch to using action from master branch.

Also bump used runtime to GNOME 47 when building.
---
 .github/workflows/flatpak-nightly.yml |  9 ++++++++-
 .github/workflows/flatpak.yml         | 11 +++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml
index 31ffd407..1b828ac1 100644
--- a/.github/workflows/flatpak-nightly.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -33,7 +33,7 @@ jobs:
         flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
         flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
     - name: Build
-      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
+      uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -41,3 +41,10 @@ jobs:
         repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
         cache-key: flatpak-builder-${{ github.sha }}-testing-${{ github.run_number }}
         arch: ${{ matrix.arch }}
+        upload-artifact: false
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: clapper-flatpak-nightly-${{ matrix.arch }}
+        path: com.github.rafostar.Clapper.flatpak
+        if-no-files-found: error
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 5e203cde..5a92e3ca 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 600
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-45
+      image: bilelmoussaoui/flatpak-github-actions:gnome-47
       options: --privileged
     strategy:
       matrix:
@@ -33,9 +33,16 @@ jobs:
       with:
         platforms: arm64
     - name: Build
-      uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
+      uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: com.github.rafostar.Clapper.flatpak
         manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json
         cache-key: flatpak-builder-${{ github.sha }}
         arch: ${{ matrix.arch }}
+        upload-artifact: false
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: clapper-flatpak-${{ matrix.arch }}
+        path: com.github.rafostar.Clapper.flatpak
+        if-no-files-found: error