From afb5acefb1c95f66168fcd2615dd694cfc4f12cf Mon Sep 17 00:00:00 2001 From: Leonhard Date: Sat, 23 Dec 2023 15:26:04 +0100 Subject: [PATCH 1/2] Maybe fix ci --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f79a20c..fec879b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,12 +26,12 @@ jobs: # This is the name of the Bundle file we're building and can be anything you like bundle: Gradebook.flatpak # This uses your app's RDNN ID - manifest-path: io.github.leolost2605.gradebook.yml + manifest-path: io.github.leolost2605.gradebook.json # You can automatically run any of the tests you've created as part of this workflow run-tests: true # These lines specify the location of the elementary Runtime and Sdk - repository-name: appcenter - repository-url: https://flatpak.elementary.io/repo.flatpakrepo + repository-name: flathub + repository-url: https://dl.flathub.org/repo/flathub.flatpakrepo cache-key: "flatpak-builder-${{ github.sha }}" From 91c6283d807dbb95f91e35ef3cb8680d919e758d Mon Sep 17 00:00:00 2001 From: Leonhard Date: Sat, 23 Dec 2023 15:33:02 +0100 Subject: [PATCH 2/2] Use different container --- .github/workflows/main.yml | 2 +- io.github.leolost2605.gradebook.yml | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 io.github.leolost2605.gradebook.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fec879b..d8a0677 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: # This job runs in a special container designed for building Flatpaks for AppCenter container: - image: ghcr.io/elementary/flatpak-platform/runtime:6 + image: bilelmoussaoui/flatpak-github-actions:gnome-45 options: --privileged # Steps represent a sequence of tasks that will be executed as part of the job diff --git a/io.github.leolost2605.gradebook.yml b/io.github.leolost2605.gradebook.yml deleted file mode 100644 index 0ccca3d..0000000 --- a/io.github.leolost2605.gradebook.yml +++ /dev/null @@ -1,19 +0,0 @@ -app-id: io.github.leolost2605.gradebook - -runtime: io.elementary.Platform -runtime-version: '7.1' -sdk: io.elementary.Sdk - -command: io.github.leolost2605.gradebook - -finish-args: - - '--share=ipc' - - '--socket=fallback-x11' - - '--socket=wayland' - -modules: - - name: gradebook - buildsystem: meson - sources: - - type: dir - path: . \ No newline at end of file