From ed6bf19d09f34f79a7f67acea843f7bf67b77c5e Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Tue, 2 Jan 2024 14:48:40 +0100
Subject: [PATCH] CI: Use tytan652/flatpak-github-actions image for Flatpak
 jobs

The actual Fedora-based image are not compatible with the action because
Fedora provides unstable version of flatpak-builder and a breakage
happened between two unstable version

This also means that the action is not completely compatible with
flatpak-builder 1.4

To solve this issue an alternative base image was proposed, but it is
not upstreamed yet, so my fork registry is used for now

Also flatpak-builder-lint is provided in the image so the related action
is modified to work with the provided version
---
 .github/actions/flatpak-builder-lint/action.yaml | 2 +-
 .github/workflows/build-project.yaml             | 5 ++---
 .github/workflows/publish.yaml                   | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/actions/flatpak-builder-lint/action.yaml b/.github/actions/flatpak-builder-lint/action.yaml
index cfbf9fadc3b164..783a4a71c21a05 100644
--- a/.github/actions/flatpak-builder-lint/action.yaml
+++ b/.github/actions/flatpak-builder-lint/action.yaml
@@ -46,7 +46,7 @@ runs:
       run: |
         : Install Dependencies 🛍️
         echo ::group::Install Dependencies
-        dnf install -y -q poetry jq
+        pip --user poetry
         poetry -q -C flatpak-builder-lint install
         echo ::endgroup::
 
diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
index 44560222a36726..90b00548a03670 100644
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -245,7 +245,7 @@ jobs:
       run:
         shell: bash
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+      image: ghcr.io/tytan652/flatpak-github-actions:kde-6.6-x86_64
       options: --privileged
     steps:
       - uses: actions/checkout@v4
@@ -264,8 +264,7 @@ jobs:
 
           git config --global --add safe.directory "${GITHUB_WORKSPACE}"
 
-          echo '::group::Install GitHub CLI tool'
-          dnf install -y -q gh
+          echo '::group::Install GitHub CLI Actions Cache Extension'
           gh extension install actions/gh-actions-cache
           echo '::endgroup::'
 
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 8040580c1ca1de..b29807b5ae9e07 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -59,7 +59,7 @@ jobs:
       YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
       YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+      image: ghcr.io/tytan652/flatpak-github-actions:kde-6.6-x86_64
       options: --privileged
     strategy:
       matrix:
@@ -81,7 +81,6 @@ jobs:
 
           git config --global --add safe.directory "${GITHUB_WORKSPACE}"
 
-          dnf install -y -q gh
           gh extension install actions/gh-actions-cache
 
           cache_key='flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}'