Skip to content

Commit

Permalink
CI: Use tytan652/flatpak-github-actions image for Flatpak jobs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tytan652 committed Feb 12, 2024
1 parent 288ed51 commit 6fc80b8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/flatpak-builder-lint/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ runs:
run: |
: Install Dependencies 🛍️
echo ::group::Install Dependencies
dnf install -y -q poetry jq
pip install poetry
poetry -q -C flatpak-builder-lint install
echo ::endgroup::
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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::'
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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') }}'
Expand Down

0 comments on commit 6fc80b8

Please sign in to comment.