chore: Rework utopia of having a single flatpak binary as an output

Author: AChep

.github/workflows/new_flatpak.yaml

@@ -52,6 +52,7 @@ jobs:
           lfs: true
           submodules: recursive
       - uses: ./.github/actions/setup_gradle
+      - uses: ./.github/actions/setup_python
       - name: "Download lib native"
         uses: actions/download-artifact@v7
         with:
@@ -72,42 +73,10 @@ jobs:
           name: app-linux-${{ matrix.arch }}
           path: |
             desktopApp/build/distributions/*.tar.gz
-  flatpak:
-    runs-on: ubuntu-latest
-    needs:
-      - build-linux-app
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v6
-        with:
-          lfs: true
-          submodules: recursive
-      - uses: ./.github/actions/setup_python
-      - name: "Download artifacts (x86_64)"
-        uses: actions/download-artifact@v7
-        with:
-          name: app-linux-x86_64
-          path: artifacts-x86_64
-      - name: "Download artifacts (aarch64)"
-        uses: actions/download-artifact@v7
-        with:
-          name: app-linux-aarch64
-          path: artifacts-aarch64
-      - name: "Verify directory structure"
-        run: |
-          find artifacts-x86_64
-          find artifacts-aarch64
       - name: "Move binaries into the template directory"
         run: |
-          mkdir -p desktopApp/flatpak/app-x86_64/
-          mkdir -p desktopApp/flatpak/app-aarch64/
-          tar -xvzf $(find . -type f -regex '\./artifacts-x86_64/.*\.tar.gz') -C desktopApp/flatpak/app-x86_64/ --strip-components=1
-          tar -xvzf $(find . -type f -regex '\./artifacts-aarch64/.*\.tar.gz') -C desktopApp/flatpak/app-aarch64/ --strip-components=1
-      - name: "Verify directory structure"
-        run: |
-          find desktopApp/flatpak
+          mkdir -p desktopApp/flatpak/app-${{ matrix.arch }}/
+          tar -xvzf $(find . -type f -regex '\./desktopApp/build/distributions/.*\.tar.gz') -C desktopApp/flatpak/app-${{ matrix.arch }}/ --strip-components=1
       - name: "Get Flatpak runtime version -install dependencies"
         run: pip install -r .github/get_flatpak_runtime_version.requirements.txt
       - name: "Get Flatpak runtime version"
@@ -123,10 +92,10 @@ jobs:
         working-directory: desktopApp/flatpak/
         run: |
           flatpak-builder --force-clean --state-dir=build/flatpak-builder --repo=build/flatpak-repo build/flatpak-target com.artemchep.keyguard.yml
-          flatpak build-bundle build/flatpak-repo Keyguard.flatpak com.artemchep.keyguard
+          flatpak build-bundle build/flatpak-repo "Keyguard-$(find . -type f -regex '\./desktopApp/build/distributions/.*\.tar.gz' | sed -E 's/.*-([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')-${{ matrix.arch }}.flatpak" com.artemchep.keyguard
       - name: 'Upload .flatpak'
         uses: actions/upload-artifact@v6
         with:
-          name: app-flatpak
+          name: app-linux-flatpak-${{ matrix.arch }}
           path: |
-            desktopApp/flatpak/Keyguard.flatpak
+            desktopApp/flatpak/Keyguard-*.flatpak

.github/workflows/new_tag_release.yaml

@@ -143,42 +143,10 @@ jobs:
           name: app-linux-${{ matrix.arch }}
           path: |
             desktopApp/build/distributions/*.tar.gz
-  build-linux-flatpak-app:
-    runs-on: ubuntu-latest
-    needs:
-      - build-linux-app
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v6
-        with:
-          lfs: true
-          submodules: recursive
-      - uses: ./.github/actions/setup_python
-      - name: "Download artifacts (x86_64)"
-        uses: actions/download-artifact@v7
-        with:
-          name: app-linux-x86_64
-          path: artifacts-x86_64
-      - name: "Download artifacts (aarch64)"
-        uses: actions/download-artifact@v7
-        with:
-          name: app-linux-aarch64
-          path: artifacts-aarch64
-      - name: "Verify directory structure"
-        run: |
-          find artifacts-x86_64
-          find artifacts-aarch64
       - name: "Move binaries into the template directory"
         run: |
-          mkdir -p desktopApp/flatpak/app-x86_64/
-          mkdir -p desktopApp/flatpak/app-aarch64/
-          tar -xvzf $(find . -type f -regex '\./artifacts-x86_64/.*\.tar.gz') -C desktopApp/flatpak/app-x86_64/ --strip-components=1
-          tar -xvzf $(find . -type f -regex '\./artifacts-aarch64/.*\.tar.gz') -C desktopApp/flatpak/app-aarch64/ --strip-components=1
-      - name: "Verify directory structure"
-        run: |
-          find desktopApp/flatpak
+          mkdir -p desktopApp/flatpak/app-${{ matrix.arch }}/
+          tar -xvzf $(find . -type f -regex '\./desktopApp/build/distributions/.*\.tar.gz') -C desktopApp/flatpak/app-${{ matrix.arch }}/ --strip-components=1
       - name: "Get Flatpak runtime version -install dependencies"
         run: pip install -r .github/get_flatpak_runtime_version.requirements.txt
       - name: "Get Flatpak runtime version"
@@ -194,13 +162,13 @@ jobs:
         working-directory: desktopApp/flatpak/
         run: |
           flatpak-builder --force-clean --state-dir=build/flatpak-builder --repo=build/flatpak-repo build/flatpak-target com.artemchep.keyguard.yml
-          flatpak build-bundle build/flatpak-repo Keyguard.flatpak com.artemchep.keyguard
+          flatpak build-bundle build/flatpak-repo "Keyguard-$(find . -type f -regex '\./desktopApp/build/distributions/.*\.tar.gz' | sed -E 's/.*-([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')-${{ matrix.arch }}.flatpak" com.artemchep.keyguard
       - name: 'Upload .flatpak'
         uses: actions/upload-artifact@v6
         with:
-          name: app-linux-flatpak
+          name: app-linux-flatpak-${{ matrix.arch }}
           path: |
-            desktopApp/flatpak/Keyguard.flatpak
+            desktopApp/flatpak/Keyguard-*.flatpak
   build-windows-app:
     runs-on: windows-latest
     env:
@@ -266,7 +234,6 @@ jobs:
     needs:
       - build-android-app
       - build-linux-app
-      - build-linux-flatpak-app
       - build-macos-app
       - build-windows-app
     env:
@@ -301,10 +268,15 @@ jobs:
         with:
           name: app-linux-aarch64
           path: artifacts
-      - name: "Download Linux app (flatpak)"
+      - name: "Download Linux app (flatpak-x86_64)"
+        uses: actions/download-artifact@v7
+        with:
+          name: app-linux-flatpak-x86_64
+          path: artifacts
+      - name: "Download Linux app (flatpak-aarch64)"
         uses: actions/download-artifact@v7
         with:
-          name: app-linux-flatpak
+          name: app-linux-flatpak-aarch64
           path: artifacts
       - name: "Download Windows app"
         uses: actions/download-artifact@v7