Update workflows with Flutter master branch

Revert "fixup! Upgrade to Flutter master branch" This reverts commit 406ce6c.
linagora · Aug 29, 2024 · 30525ff · 30525ff
1 parent 7270b99
commit 30525ff
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/analyze-test.yaml b/.github/workflows/analyze-test.yaml
@@ -32,8 +32,8 @@ jobs:
       - name: Setup flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.25.0-1.0.pre.160"
-          channel: "stable"
+          flutter-version: "3.25.0-0.1.pre"
+          channel: "master"
           cache: true
           cache-key: "deps-${{ hashFiles('**/pubspec.lock') }}"
           cache-path: ${{ runner.tool_cache }}/flutter # optional, change this to specify the cache path

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
 name: Build dev binaries
 
 env:
-  FLUTTER_VERSION: 3.25.0-1.0.pre.160
+  FLUTTER_VERSION: 3.25.0-0.1.pre
   XCODE_VERSION: ^15.0.1
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: "stable"
+          channel: "master"
           cache: true
           cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache
           cache-path: ${{ runner.tool_cache }}/flutter # optional, change this to specify the cache path

diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -23,8 +23,8 @@ jobs:
       - name: Setup flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.25.0-1.0.pre.160"
-          channel: "stable"
+          flutter-version: "3.25.0-0.1.pre"
+          channel: "master"
           cache: true
           cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache
           cache-path: ${{ runner.tool_cache }}/flutter # optional, change this to specify the cache path

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
 name: Release
 
 env:
-  FLUTTER_VERSION: 3.25.0-1.0.pre.160
+  FLUTTER_VERSION: 3.25.0-0.1.pre
   XCODE_VERSION: ^15.0.1
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: "stable"
+          channel: "master"
           cache: true
           cache-key: deps-${{ hashFiles('**/pubspec.lock') }} # optional, change this to force refresh cache
           cache-path: ${{ runner.tool_cache }}/flutter # optional, change this to specify the cache path

diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh
@@ -9,31 +9,31 @@ flutter pub get && dart run build_runner build --delete-conflicting-outputs
 
 ## Install necessary pods
 # cd ../ios
-# flutter pub get && pod install
+# flutter pub upgrade && pod install
 
 cd ../model
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../contact
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../forward
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../rule_filter
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../fcm
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../email_recovery
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ../server_settings
-flutter pub get && dart run build_runner build --delete-conflicting-outputs
+flutter pub upgrade && dart run build_runner build --delete-conflicting-outputs
 
 cd ..
-flutter pub get \
+flutter pub upgrade \
     && dart run build_runner build --delete-conflicting-outputs \
     && dart run intl_generator:extract_to_arb --output-dir=./lib/l10n lib/main/localizations/app_localizations.dart \
     && dart run intl_generator:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/main/localizations/app_localizations.dart lib/l10n/intl*.arb