Skip to content

Commit ecf7643

Browse files
authored
Change the git clone to sync to the stable branch and only to download the single (stable) branch (#7284)
This will prevent Flutter IJ work if the master branch gets into a state that the master branch can't build the cli tool.
1 parent 3160d74 commit ecf7643

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tool/github.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ set -e
99

1010
export JAVA_HOME=$JAVA_HOME_17_X64
1111

12-
git clone --depth 1 https://github.com/flutter/flutter.git ../flutter
12+
# Clone and configure Flutter to the latest stable release
13+
git clone --depth 1 -b stable --single-branch https://github.com/flutter/flutter.git ../flutter
1314
export PATH="$PATH":`pwd`/../flutter/bin:`pwd`/../flutter/bin/cache/dart-sdk/bin
1415
flutter config --no-analytics
1516
flutter doctor

tool/kokoro/setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ setup() {
1919
echo "JAVA_HOME=$JAVA_HOME"
2020
java -version
2121

22-
# If we move to branch-based builds we might not be able to use such a shallow clone.
23-
git clone --depth 1 https://github.com/flutter/flutter.git ../flutter
22+
# Clone and configure Flutter to the latest stable release
23+
git clone --depth 1 -b stable --single-branch https://github.com/flutter/flutter.git ../flutter
2424
export PATH="$PATH":`pwd`/../flutter/bin:`pwd`/../flutter/bin/cache/dart-sdk/bin
2525
flutter config --no-analytics
2626
flutter doctor
27-
export FLUTTER_SDK=`pwd`/../flutter
2827

28+
export FLUTTER_SDK=`pwd`/../flutter
2929
export FLUTTER_KEYSTORE_ID=74840
3030
export FLUTTER_KEYSTORE_NAME=flutter-intellij-plugin-auth-token
3131
export FLUTTER_KEYSTORE_JXBROWSER_KEY_NAME=flutter-intellij-plugin-jxbrowser-license-key

0 commit comments

Comments
 (0)