From 551e0211ac21910226b4171b34f4344093e72403 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 27 Feb 2025 12:42:47 -0500 Subject: [PATCH] ci: don't send temp screenshots to flathub, fix lint failure for not doing so --- .github/workflows/continuous-integration.yml | 3 +-- REUSE.toml | 2 +- deploy/linux/flatpak/ci-build-lint-exceptions.json | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 deploy/linux/flatpak/ci-build-lint-exceptions.json diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c6ccc3388..ba937b597 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -370,10 +370,9 @@ jobs: cache-key: flatpak-builder-${{matrix.flatpak.arch}}-2.0 arch: ${{matrix.flatpak.arch}} upload-artifact: false - mirror-screenshots-url: https://dl.flathub.org/media - name: Validate build - run: flatpak-builder-lint repo repo + run: flatpak-builder-lint --exceptions --user-exceptions deploy/linux/flatpak/ci-build-lint-exceptions.json repo repo - name: Upload uses: actions/upload-artifact@v4 diff --git a/REUSE.toml b/REUSE.toml index f5be7f673..f410fb77f 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -97,7 +97,7 @@ SPDX-FileCopyrightText = "Deskflow Developers" SPDX-License-Identifier = "GPL-2.0-only" [[annotations]] -path = "deploy/linux/flatpak/org.deskflow.deskflow.yml" +path = "deploy/linux/flatpak/**" precedence = "override" SPDX-FileCopyrightText = "Deskflow Developers" SPDX-License-Identifier = "MIT" diff --git a/deploy/linux/flatpak/ci-build-lint-exceptions.json b/deploy/linux/flatpak/ci-build-lint-exceptions.json new file mode 100644 index 000000000..85ee29be0 --- /dev/null +++ b/deploy/linux/flatpak/ci-build-lint-exceptions.json @@ -0,0 +1,6 @@ +{ + "org.deskflow.deskflow": [ + "appstream-external-screenshot-url", + "appstream-screenshots-not-mirrored-in-ostree" + ] +}