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.
This commit is contained in:
Rafał Dzięgiel
2025-01-19 17:30:28 +01:00
parent 4df812066f
commit ce102b9c76
2 changed files with 17 additions and 3 deletions

View File

@@ -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.rust-stable/${{ matrix.arch }}/24.08
flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08 flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
- name: Build - name: Build
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 uses: flatpak/flatpak-github-actions/flatpak-builder@master
with: with:
bundle: com.github.rafostar.Clapper.flatpak bundle: com.github.rafostar.Clapper.flatpak
manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-nightly.json manifest-path: pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -41,3 +41,10 @@ jobs:
repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
cache-key: flatpak-builder-${{ github.sha }}-testing-${{ github.run_number }} cache-key: flatpak-builder-${{ github.sha }}-testing-${{ github.run_number }}
arch: ${{ matrix.arch }} 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

View File

@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 600 timeout-minutes: 600
container: container:
image: bilelmoussaoui/flatpak-github-actions:gnome-45 image: bilelmoussaoui/flatpak-github-actions:gnome-47
options: --privileged options: --privileged
strategy: strategy:
matrix: matrix:
@@ -33,9 +33,16 @@ jobs:
with: with:
platforms: arm64 platforms: arm64
- name: Build - name: Build
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 uses: flatpak/flatpak-github-actions/flatpak-builder@master
with: with:
bundle: com.github.rafostar.Clapper.flatpak bundle: com.github.rafostar.Clapper.flatpak
manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json manifest-path: pkgs/flatpak/com.github.rafostar.Clapper.json
cache-key: flatpak-builder-${{ github.sha }} cache-key: flatpak-builder-${{ github.sha }}
arch: ${{ matrix.arch }} 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