From fc79e813ea78c58f445bef49dc6ae27e54fc3570 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Sun, 5 Nov 2023 21:40:22 +0100 Subject: [PATCH] CI: Allow to silence errors related to publish This option allows to validate the Flatpak repo on pushes workflow. --- .github/actions/flatpak-builder-lint/action.yaml | 14 ++++++++++++-- .github/workflows/build-project.yaml | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/actions/flatpak-builder-lint/action.yaml b/.github/actions/flatpak-builder-lint/action.yaml index 49b989ee3..79df53d12 100644 --- a/.github/actions/flatpak-builder-lint/action.yaml +++ b/.github/actions/flatpak-builder-lint/action.yaml @@ -7,6 +7,10 @@ inputs: path: description: Path to flatpak-builder manifest or Flatpak build directory required: true + validateToPublish: + description: If false, turns some errors to non-errors for non-publish workflow + required: false + default: true workingDirectory: description: Working directory to clone flatpak-builder-lint required: false @@ -65,9 +69,15 @@ runs: done n_errors=$(echo $ret | jq '.errors | length') - for ((i = 0; i < $n_errors; i++)); do + for ((i = 0 ; i < $(echo $ret | jq '.errors | length') ; i++)); do error=$(echo $ret | jq ".errors[$i]") - echo "::error::$error found in the Flatpak ${{ inputs.artifact }}" + + if [[ "${{ inputs.validateToPublish }}" == "false" && "${error//\"}" == "appstream-screenshots-not-mirrored" ]]; then + echo "::notice::$error found and ignored in the Flatpak ${{ inputs.artifact }}" + n_errors=$(($n_errors-1)) + else + echo "::error::$error found in the Flatpak ${{ inputs.artifact }}" + fi done [[ $n_errors == 0 ]] || exit 2 diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 9df784fc9..d5a5cb6fd 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -291,6 +291,7 @@ jobs: with: artifact: manifest path: build-aux/com.obsproject.Studio.json + validateToPublish: false - name: Build Flatpak Manifest 🧾 uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf @@ -307,6 +308,7 @@ jobs: with: artifact: builddir path: flatpak_app + validateToPublish: false windows-build: name: Windows 🪟