From 79f5110ba3d8352b64a40cee963da470baa040e7 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Sun, 12 May 2024 20:10:49 +0200
Subject: [PATCH] Set rive version to 0.12.4 and re-add flathub build

---
 .github/workflows/build-release.yml | 64 ++++++++++++++---------------
 pubspec.yaml                        |  3 +-
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 6e1e8e17c..9f4915c52 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -57,14 +57,14 @@ jobs:
           flutter pub run cider version ${{ env.VERSION }}+${{ env.BUILD }}
           flutter pub run cider bump build
 
-      #      - name: Build application for linux
-      #        run: |
-      #          sudo apt update
-      #          sudo apt install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev
-      #          flutter build linux --release
-      #          cd flatpak/scripts
-      #          dart pub get
-      #          dart flatpak_packager.dart --meta ../flatpak_meta.json --github --addTodaysVersion ${{ env.VERSION }}
+      - name: Build application for linux
+        run: |
+          sudo apt update
+          sudo apt install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev
+          flutter build linux --release
+          cd flatpak/scripts
+          dart pub get
+          dart flatpak_packager.dart --meta ../flatpak_meta.json --github --addTodaysVersion ${{ env.VERSION }}
 
       - name: Build AAB
         run: flutter build appbundle --release
@@ -88,30 +88,30 @@ jobs:
           files: |
             build/app/outputs/bundle/release/app-release.aab
             build/app/outputs/flutter-apk/app-release.apk
-      #            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
-      #            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256
-
-      #      - name: Generate flathub manifest
-      #        run: |
-      #          cd flatpak/scripts
-      #          dart pub get
-      #          dart manifest_generator.dart --meta ../flatpak_meta.json --github
-      #          mkdir ../../flathub
-      #          cp flatpak_generator_exports/de.wger.flutter.json ../../flathub
-      #          cp flatpak_generator_exports/flathub.json ../../flathub
-      #
-      #      - name: Push updated config to flathub repository
-      #        uses: cpina/github-action-push-to-another-repository@main
-      #        env:
-      #          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-      #        with:
-      #          source-directory: flathub
-      #          destination-github-username: wger-project
-      #          destination-repository-name: de.wger.flutter
-      #          user-email: github-actions@github.com
-      #          target-branch: release-${{ env.VERSION }}
-      #          create-target-branch-if-needed: true
-      #          commit-message: Update to ${{ env.VERSION }}
+            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
+            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256
+
+      - name: Generate flathub manifest
+        run: |
+          cd flatpak/scripts
+          dart pub get
+          dart manifest_generator.dart --meta ../flatpak_meta.json --github
+          mkdir ../../flathub
+          cp flatpak_generator_exports/de.wger.flutter.json ../../flathub
+          cp flatpak_generator_exports/flathub.json ../../flathub
+
+      - name: Push updated config to flathub repository
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: flathub
+          destination-github-username: wger-project
+          destination-repository-name: de.wger.flutter
+          user-email: github-actions@github.com
+          target-branch: release-${{ env.VERSION }}
+          create-target-branch-if-needed: true
+          commit-message: Update to ${{ env.VERSION }}
 
       # Note: the original tag that triggered the workflow is in the form vX.Y.Z
       #       but the pubspec.yaml is committed in the commit after that one.
diff --git a/pubspec.yaml b/pubspec.yaml
index ffb55f706..0cc238f54 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -47,7 +47,8 @@ dependencies:
   version: ^3.0.2
   package_info_plus: ^7.0.0
   provider: ^6.1.2
-  rive: ^0.13.4
+  # Note, do not update rive! https://github.com/wger-project/flutter/issues/577
+  rive: ^0.12.4
   shared_preferences: ^2.2.3
   table_calendar: ^3.0.8
   url_launcher: ^6.2.6