TƯ-1781 Fix ci failed

linagora · May 25, 2024 · b531698 · b531698
1 parent cb6cbbb
commit b531698
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin" # See 'Supported distributions' for available options
-          java-version: "11"
+          java-version: "17"
 
       - name: Select Xcode version
         if: matrix.os == 'ios'

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -52,7 +52,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin" # See 'Supported distributions' for available options
-          java-version: "11"
+          java-version: "17"
 
       - name: Select Xcode version
         if: matrix.os == 'ios'

diff --git a/scripts/build-android-apk.sh b/scripts/build-android-apk.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 flutter build apk --release
 mkdir -p build/android
 cp build/app/outputs/apk/release/app-release.apk build/android/
diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
@@ -9,4 +9,5 @@ sudo apt-get install -y clang cmake ninja-build \
 flutter config --enable-linux-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 flutter build linux --release -v
diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
@@ -2,6 +2,7 @@
 flutter config --enable-macos-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 cd macos
 bundle exec fastlane sync_dev_id
 pod install --repo-update

diff --git a/scripts/build-web.sh b/scripts/build-web.sh
@@ -3,5 +3,6 @@ flutter config --enable-web
 flutter clean
 flutter pub get
 flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 flutter build web --release --verbose --source-maps --base-href="/web/"
 cp config.sample.json ./build/web/config.json
diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
@@ -3,6 +3,7 @@ echo "Building for Windows."
 flutter config --enable-windows-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 flutter build windows --release -v
 
 # Building libolm

diff --git a/scripts/package-windows.sh b/scripts/package-windows.sh
@@ -5,4 +5,5 @@ curl -OL "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe"
 ./innosetup-6.2.2.exe //verysilent
 
 echo "Packaging."
+flutter pub get
 flutter pub global run flutter_distributor:main.dart package --platform windows --targets exe --skip-clean --flutter-build-args="release"
diff --git a/scripts/prepare-ios.sh b/scripts/prepare-ios.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 # Use alternate beautifier
 brew install xcbeautify
 cd ios

diff --git a/scripts/release-playstore-beta.sh b/scripts/release-playstore-beta.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
+flutter pub get
 flutter build appbundle --release
 cd android
 bundle exec fastlane deploy_internal_test