From 3c05a266556395eb4bf65b37f84b1060d002a639 Mon Sep 17 00:00:00 2001 From: knuxify Date: Fri, 14 Feb 2025 16:42:02 +0100 Subject: [PATCH 1/3] ci: fix flatpak build by switching to maintained fork of flatpak github action --- .github/workflows/msbuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 84e97f5..1cfcbf4 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -105,11 +105,11 @@ jobs: build-linux64-flatpak: runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08 + image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-23.08 options: --privileged steps: - uses: actions/checkout@v4 - - uses: flatpak/flatpak-github-actions/flatpak-builder@master + - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master continue-on-error: true with: bundle: voidsprite-build-linux64-flatpak.flatpak @@ -139,4 +139,4 @@ jobs: with: name: voidsprite-build-mac-intel64 path: | - voidsprite.app.tar \ No newline at end of file + voidsprite.app.tar From b58ed026dd634356ad82348448d74fe7b1e16bdb Mon Sep 17 00:00:00 2001 From: knuxify Date: Fri, 14 Feb 2025 16:42:31 +0100 Subject: [PATCH 2/3] flatpak: fix flatpak README typo --- freesprite/linux/flatpak/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freesprite/linux/flatpak/README.md b/freesprite/linux/flatpak/README.md index 4e74216..0b2cc12 100644 --- a/freesprite/linux/flatpak/README.md +++ b/freesprite/linux/flatpak/README.md @@ -4,7 +4,7 @@ To build: - `git clone https://github.com/counter185/voidsprite` - `cd voidsprite` -- `cd freesprite/linux/flatpack` +- `cd freesprite/linux/flatpak` - `flatpak-builder --repo flatpak-repo .flatpak-builder com.github.counter185.voidsprite.yml --force-clean` - `flatpak build-bundle flatpak-repo voidsprite.flatpak com.github.counter185.voidsprite` From 92715d8fad6ee1586bb75efb838d72196e097db6 Mon Sep 17 00:00:00 2001 From: knuxify Date: Fri, 14 Feb 2025 16:43:01 +0100 Subject: [PATCH 3/3] flatpak: update to freedesktop 24.08 runtime --- .github/workflows/msbuild.yml | 2 +- freesprite/linux/flatpak/com.github.counter185.voidsprite.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 1cfcbf4..f8cdefd 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -105,7 +105,7 @@ jobs: build-linux64-flatpak: runs-on: ubuntu-latest container: - image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-23.08 + image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08 options: --privileged steps: - uses: actions/checkout@v4 diff --git a/freesprite/linux/flatpak/com.github.counter185.voidsprite.yml b/freesprite/linux/flatpak/com.github.counter185.voidsprite.yml index 156f682..82bc5a8 100644 --- a/freesprite/linux/flatpak/com.github.counter185.voidsprite.yml +++ b/freesprite/linux/flatpak/com.github.counter185.voidsprite.yml @@ -1,6 +1,6 @@ id: com.github.counter185.voidsprite runtime: org.freedesktop.Platform -runtime-version: '23.08' +runtime-version: '24.08' sdk: org.freedesktop.Sdk command: voidsprite