diff options
| author | tytan652 <tytan652@tytanium.xyz> | 2024-02-23 10:37:20 +0100 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <GeorgesStavracas@users.noreply.github.com> | 2024-02-23 09:40:06 -0300 |
| commit | 409bd12db38095f440bd59da68a7df46c6787a4e (patch) | |
| tree | f5070c383f912aab57c7aaa701a186d2b8dc86a2 | |
| parent | 63eef36786a0efb0c3532ebd1f63996b8d3dab3f (diff) | |
CI: Update Flatpak AppStream validation
Also add AppStream validation to Build Project workflow
| -rw-r--r-- | .github/workflows/build-project.yaml | 15 | ||||
| -rw-r--r-- | .github/workflows/publish.yaml | 16 |
2 files changed, 23 insertions, 8 deletions
diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index a9dd34194..41d11aa0b 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -244,6 +244,8 @@ jobs: defaults: run: shell: bash + env: + FLATPAK_BUILD_SHARE_PATH: flatpak_app/files/share container: image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.6 options: --privileged @@ -298,6 +300,19 @@ jobs: cache-key: ${{ steps.setup.outputs.cacheKey }} mirror-screenshots-url: https://dl.flathub.org/media + - name: Validate AppStream + uses: ./.github/actions/flatpak-builder-lint + with: + artifact: appstream + path: ${{ env.FLATPAK_BUILD_SHARE_PATH }}/metainfo/com.obsproject.Studio.metainfo.xml + + - name: Verify Icon and Metadata in app-info + working-directory: ${{ env.FLATPAK_BUILD_SHARE_PATH }} + run: | + : Verify Icon and Metadata in app-info + test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "::error::Missing 128x128 icon in app-info"; exit 1; } + test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "::error::Missing com.obsproject.Studio.xml.gz in app-info"; exit 1; } + - name: Validate build directory uses: ./.github/actions/flatpak-builder-lint with: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fc98164f1..16c371b0f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -49,7 +49,7 @@ jobs: run: shell: bash env: - FLATPAK_BUILD_PATH: flatpak_app/files/share + FLATPAK_BUILD_SHARE_PATH: flatpak_app/files/share TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }} TWITCH_HASH: ${{ secrets.TWITCH_HASH }} RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }} @@ -114,17 +114,17 @@ jobs: branch: ${{ matrix.branch }} - name: Validate AppStream - working-directory: ${{ env.FLATPAK_BUILD_PATH }} - run: | - : Validate AppStream - appstream-util validate appdata/com.obsproject.Studio.appdata.xml + uses: ./.github/actions/flatpak-builder-lint + with: + artifact: appstream + path: ${{ env.FLATPAK_BUILD_SHARE_PATH }}/metainfo/com.obsproject.Studio.metainfo.xml - name: Verify Icon and Metadata in app-info - working-directory: ${{ env.FLATPAK_BUILD_PATH }} + working-directory: ${{ env.FLATPAK_BUILD_SHARE_PATH }} run: | : Verify Icon and Metadata in app-info - test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "Missing 128x128 icon in app-info!"; exit 1; } - test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "Missing com.obsproject.Studio.xml.gz in app-info!"; exit 1; } + test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "::error::Missing 128x128 icon in app-info"; exit 1; } + test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "::error::Missing com.obsproject.Studio.xml.gz in app-info"; exit 1; } - name: Validate build directory uses: ./.github/actions/flatpak-builder-lint |