From 577c8e239e67f72fc693f228c15517f60d7a0f0b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 29 Jun 2022 11:04:27 +0200 Subject: [PATCH 1/2] [ci][desktop] Ensure that latest version is present in changelog Signed-off-by: Francesco Gazzetta --- .github/workflows/linux-check.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml index 86fef97dce..071120dc5e 100644 --- a/.github/workflows/linux-check.yaml +++ b/.github/workflows/linux-check.yaml @@ -171,3 +171,19 @@ jobs: - name: Validate appstream data shell: bash run: flatpak run org.freedesktop.appstream-glib validate --nonet qt/res/app.organicmaps.desktop.metainfo.xml + + - name: Ensure that latest version is present in changelog + shell: bash + run: | + version_regex='version: *(.*)-FDroid' + version_file='android/src/fdroid/play/version.yaml' + if [[ "$(cat $version_file)" =~ $regex ]]; then + version="${BASH_REMATCH[1]}" + if ! grep "release version=\"$version\"" 'qt/res/app.organicmaps.desktop.metainfo.xml'; then + echo "Changelog for version '$version' not found in '$version_file'." + exit 1 + fi + else + echo "Failed to find current version from '$version_file' with regex '$version_regex'." + exit 1 + fi -- 2.45.3 From 355cbed6134543a30f841c0a871655331f3a15d7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 29 Jun 2022 11:33:46 +0200 Subject: [PATCH 2/2] [ci][desktop] Run appstream validation only on relevant changes Signed-off-by: Francesco Gazzetta --- .github/workflows/linux-appstream.yaml | 64 ++++++++++++++++++++++++++ .github/workflows/linux-check.yaml | 39 ---------------- 2 files changed, 64 insertions(+), 39 deletions(-) create mode 100644 .github/workflows/linux-appstream.yaml diff --git a/.github/workflows/linux-appstream.yaml b/.github/workflows/linux-appstream.yaml new file mode 100644 index 0000000000..273c6363fa --- /dev/null +++ b/.github/workflows/linux-appstream.yaml @@ -0,0 +1,64 @@ +name: Linux Appstream +on: + workflow_dispatch: # Manual trigger + push: + branches: + - master + paths: + - qt/res/app.organicmaps.desktop.metainfo.xml + # So that we can check for missing changelog entries: + - android/src/fdroid/play/version.yaml + pull_request: + paths: + - qt/res/app.organicmaps.desktop.metainfo.xml + # So that we can check for missing changelog entries: + - android/src/fdroid/play/version.yaml + +jobs: + validate-appstream: + name: Validate appstream data + runs-on: ubuntu-latest + strategy: + fail-fast: false + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Install appstream validator + shell: bash + run: | + sudo apt update -y + sudo apt install -y \ + flatpak + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + # We get it from flathub to ensure we have a recent version + sudo flatpak install -y org.freedesktop.appstream-glib + + - name: Validate appstream data + shell: bash + run: flatpak run org.freedesktop.appstream-glib validate --nonet qt/res/app.organicmaps.desktop.metainfo.xml + + changelog: + name: Validate changelog + runs-on: ubuntu-latest + strategy: + fail-fast: false + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Ensure that latest version is present in changelog + shell: bash + run: | + version_regex='version: *(.*)-FDroid' + version_file='android/src/fdroid/play/version.yaml' + if [[ "$(cat $version_file)" =~ $regex ]]; then + version="${BASH_REMATCH[1]}" + if ! grep "release version=\"$version\"" 'qt/res/app.organicmaps.desktop.metainfo.xml'; then + echo "Changelog for version '$version' not found in '$version_file'." + exit 1 + fi + else + echo "Failed to find current version from '$version_file' with regex '$version_regex'." + exit 1 + fi diff --git a/.github/workflows/linux-check.yaml b/.github/workflows/linux-check.yaml index 071120dc5e..9e30ed55af 100644 --- a/.github/workflows/linux-check.yaml +++ b/.github/workflows/linux-check.yaml @@ -148,42 +148,3 @@ jobs: -e routing_consistency_tests \ -e opening_hours_supported_features_tests \ -e storage_integration_tests \ - - linux-appstream: - name: Linux validate appstream data - runs-on: ubuntu-latest - strategy: - fail-fast: false - steps: - - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install appstream validator - shell: bash - run: | - sudo apt update -y - sudo apt install -y \ - flatpak - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - # We get it from flathub to ensure we have a recent version - sudo flatpak install -y org.freedesktop.appstream-glib - - - name: Validate appstream data - shell: bash - run: flatpak run org.freedesktop.appstream-glib validate --nonet qt/res/app.organicmaps.desktop.metainfo.xml - - - name: Ensure that latest version is present in changelog - shell: bash - run: | - version_regex='version: *(.*)-FDroid' - version_file='android/src/fdroid/play/version.yaml' - if [[ "$(cat $version_file)" =~ $regex ]]; then - version="${BASH_REMATCH[1]}" - if ! grep "release version=\"$version\"" 'qt/res/app.organicmaps.desktop.metainfo.xml'; then - echo "Changelog for version '$version' not found in '$version_file'." - exit 1 - fi - else - echo "Failed to find current version from '$version_file' with regex '$version_regex'." - exit 1 - fi -- 2.45.3