From 6c6c0f2cce27fa0c3e4ac7fdf0ab0f0b6ffaa422 Mon Sep 17 00:00:00 2001
From: Steffen Kleinle <steffen.kleinle@mailbox.org>
Date: Fri, 10 Jan 2025 11:35:40 +0100
Subject: [PATCH] Simplify flutter installation in CI

---
 .circleci/config.yml                       | 28 +------------------
 .circleci/src/commands/install_flutter.yml | 31 +---------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bac2707e..b81eaf17 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,34 +80,8 @@ commands:
                     - ios
                 type: enum
         steps:
-            - when:
-                condition:
-                    equal:
-                        - << parameters.precache >>
-                        - ios
-                steps:
-                    - run:
-                        command: |
-                            brew tap dart-lang/dart
-                            brew install dart@3.5.3
-                            brew link dart@3.5.3
-                        name: Install Dart Mac
-            - unless:
-                condition:
-                    equal:
-                        - << parameters.precache >>
-                        - ios
-                steps:
-                    - run:
-                        command: |
-                            curl -o dart.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.3/linux_packages/dart_3.5.3-1_amd64.deb
-                            sudo dpkg -i dart.deb
-                        name: Install Dart Linux
             - run:
-                command: |
-                    dart pub global activate fvm
-                    echo 'export PATH=$HOME/.pub-cache/bin:$PATH' >> $BASH_ENV
-                    export PATH="$PATH":"$HOME/.pub-cache/bin"
+                command: curl -fsSL https://fvm.app/install.sh | bash
                 name: Install FVM
             - restore_cache:
                 keys:
diff --git a/.circleci/src/commands/install_flutter.yml b/.circleci/src/commands/install_flutter.yml
index b7750f55..30e86e88 100644
--- a/.circleci/src/commands/install_flutter.yml
+++ b/.circleci/src/commands/install_flutter.yml
@@ -4,38 +4,9 @@ parameters:
     default: none
     enum: [none, android, ios]
 steps:
-# Recommended installation not working at the moment, see https://github.com/leoafarias/fvm/issues/796
-#  - run:
-#      name: Install FVM
-#      command: curl -fsSL https://fvm.app/install.sh | bash
-# Therefore use workaround by installing dart first:
-# Workaround start
-  - when:
-      condition:
-        equal: [<< parameters.precache >>, ios]
-      steps:
-        - run:
-            name: Install Dart Mac
-            command: |
-              brew tap dart-lang/dart
-              brew install dart@3.5.3
-              brew link dart@3.5.3
-  - unless:
-      condition:
-        equal: [<< parameters.precache >>, ios]
-      steps:
-        - run:
-            name: Install Dart Linux
-            command: |
-              curl -o dart.deb https://storage.googleapis.com/dart-archive/channels/stable/release/3.5.3/linux_packages/dart_3.5.3-1_amd64.deb
-              sudo dpkg -i dart.deb
   - run:
       name: Install FVM
-      command: |
-        dart pub global activate fvm
-        echo 'export PATH=$HOME/.pub-cache/bin:$PATH' >> $BASH_ENV
-        export PATH="$PATH":"$HOME/.pub-cache/bin"
-# Workaround end
+      command: curl -fsSL https://fvm.app/install.sh | bash
   - restore_cache:
       keys:
         - v1-fvm-{{ arch }}-{{ checksum ".fvmrc" }}-{{ checksum "pubspec.yaml" }}-{{ checksum "pubspec.lock"  }}