From bac16e3c29b190a51e3584f992e7490070459214 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 14 Oct 2025 13:00:04 +0700
Subject: [PATCH] TF-4058 Upgrade flutter version to 3.32.8 for CI and
 Dockerfile

---
 .github/workflows/analyze-test.yaml | 5 ++++-
 .github/workflows/build.yaml        | 2 +-
 .github/workflows/gh-pages.yaml     | 2 +-
 .github/workflows/release.yaml      | 2 +-
 Dockerfile                          | 4 +---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/analyze-test.yaml b/.github/workflows/analyze-test.yaml
index 60427c9d4..199df6f10 100644
--- a/.github/workflows/analyze-test.yaml
+++ b/.github/workflows/analyze-test.yaml
@@ -8,6 +8,9 @@ on:
 
 name: Analyze and test
 
+env:
+  FLUTTER_VERSION: 3.32.8
+
 jobs:
   analyze-test:
     runs-on: ubuntu-latest
@@ -32,7 +35,7 @@ jobs:
       - name: Setup flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.27.4"
+          flutter-version: ${{ env.FLUTTER_VERSION }}
           channel: "stable"
           cache: true
           cache-key: "deps-${{ hashFiles('**/pubspec.lock') }}"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 26a0d0876..d32d939ab 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
 name: Build dev binaries
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
   XCODE_VERSION: 16.0
 
 jobs:
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
index 64bf3ea54..b00085d00 100644
--- a/.github/workflows/gh-pages.yaml
+++ b/.github/workflows/gh-pages.yaml
@@ -6,7 +6,7 @@ on:
 name: Deploy PR on Github Pages
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 200708445..65ec1bb0a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
 name: Release
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
   XCODE_VERSION: 16.0
 
 jobs:
diff --git a/Dockerfile b/Dockerfile
index 52bf78623..fa35979b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
-ARG FLUTTER_VERSION=3.27.4
+ARG FLUTTER_VERSION=3.32.8
 # Stage 1 - Install dependencies and build the app
 # This matches the flutter version on our CI/CD pipeline on Github
-# FROM --platform=amd64 ghcr.io/cirruslabs/flutter:${FLUTTER_VERSION} AS build-env
 FROM --platform=amd64 ghcr.io/instrumentisto/flutter:${FLUTTER_VERSION} AS build-env
-# TODO: Revert back to cirruslabs when upgrade Flutter pass 3.27.4, as this tag is missing for cirruslabs
 
 # Set directory to Copy App
 WORKDIR /app