CI/Flatpak: Use flathub container again

This commit is contained in:
Stenzek 2024-07-10 15:14:03 +10:00
parent c1976f4b53
commit 6abea551b5
No known key found for this signature in database
1 changed files with 18 additions and 18 deletions

View File

@ -268,7 +268,7 @@ jobs:
linux-flatpak-build: linux-flatpak-build:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: container:
image: bilelmoussaoui/flatpak-github-actions:kde-6.7 image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
options: --privileged options: --privileged
timeout-minutes: 120 timeout-minutes: 120
steps: steps:
@ -291,14 +291,14 @@ jobs:
scripts/generate-metainfo.sh scripts/flatpak scripts/generate-metainfo.sh scripts/flatpak
cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
#- name: Validate AppStream XML - name: Validate AppStream XML
# run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
#- name: Validate manifest - name: Validate manifest
# run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json
- name: Build Flatpak - name: Build Flatpak
uses: flatpak/flatpak-github-actions/flatpak-builder@d6ddccb268e43e87b19ca0112b83de26fb83b215 uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
with: with:
bundle: duckstation-x64.flatpak bundle: duckstation-x64.flatpak
upload-artifact: false upload-artifact: false
@ -306,24 +306,24 @@ jobs:
arch: x86_64 arch: x86_64
build-bundle: true build-bundle: true
verbose: true verbose: true
#mirror-screenshots-url: https://dl.flathub.org/media mirror-screenshots-url: https://dl.flathub.org/media
branch: stable branch: stable
cache: true cache: true
restore-cache: true restore-cache: true
cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }} cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }}
#- name: Push to Flathub stable - name: Push to Flathub stable
# if: github.ref == 'refs/heads/dev' if: github.ref == 'refs/heads/dev'
# uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8 uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
# with: with:
# flat-manager-url: https://hub.flathub.org/ flat-manager-url: https://hub.flathub.org/
# repository: stable repository: stable
# token: ${{ secrets.FLATHUB_STABLE_TOKEN }} token: ${{ secrets.FLATHUB_STABLE_TOKEN }}
# build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
#- name: Validate build - name: Validate build
# run: | run: |
# flatpak-builder-lint repo repo flatpak-builder-lint repo repo
- name: Upload Flatpak - name: Upload Flatpak
uses: actions/upload-artifact@v4.3.3 uses: actions/upload-artifact@v4.3.3