Cache the flutter-sdk for testing

.github/workflows/build.yaml

@@ -14,24 +14,85 @@ on:
 permissions: read-all
 
 env:
-  AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:
+  flutter-prep:
+    name: ${{ matrix.os }} Flutter Prep
+    outputs:
+      latest_flutter_candidate: ${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: git clone devtools
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+
+      - name: Get Latest Flutter Candidate
+        id: flutter-candidate
+        run: |
+          LATEST_FLUTTER_CANDIDATE=$(./tool/latest_flutter_candidate.sh)
+          echo "FLUTTER_CANDIDATE=$LATEST_FLUTTER_CANDIDATE" >> $GITHUB_OUTPUT
+
+      - name: Load Cached Flutter SDK
+        id: cache-flutter
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./flutter-sdk
+          key: flutter-sdk-${{ runner.os }}-${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}
+
+      - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
+        name: Clone Flutter SDK if none cached
+        run: |
+          git clone https://github.com/flutter/flutter.git ./flutter-sdk
+          cd flutter-sdk
+          git checkout $LATEST_FLUTTER_CANDIDATE
+        env:
+          LATEST_FLUTTER_CANDIDATE: ${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}
+
+      - name: Assert that the Latest Flutter Candidate is checked out
+        run: |
+            cd flutter-sdk
+            HEAD_SHA=$(git rev-parse HEAD)
+            LATEST_FLUTTER_CANDIDATE_SHA=$(git rev-parse "origin/$LATEST_FLUTTER_CANDIDATE")
+            if [ "$HEAD_SHA" != "$LATEST_FLUTTER_CANDIDATE_SHA" ]; then
+              echo "::error ,title=Error checking out Latest Flutter Candidate::{expected HEAD to be at $LATEST_FLUTTER_CANDIDATE_SHA but got $HEAD_SHA}"
+              exit 1
+            fi
+        env:
+          LATEST_FLUTTER_CANDIDATE: ${{ steps.flutter-candidate.outputs.FLUTTER_CANDIDATE }}
+
+      - name: Setup Flutter SDK
+        run: |
+          ./flutter-sdk/bin/flutter config --no-analytics
+          ./flutter-sdk/bin/flutter doctor
+          ./flutter-sdk/bin/cache/dart-sdk/bin/dart --disable-analytics
+
   main:
     name: main
+    needs: flutter-prep
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
       - name: git clone
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Load Cached Flutter SDK
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./flutter-sdk
+          key: flutter-sdk-${{ runner.os }}-${{ needs.flutter-prep.outputs.latest_flutter_candidate }} 
+
       - name: tool/bots.sh
         env:
           BOT: main
         run: ./tool/bots.sh
 
   test:
     name: ${{ matrix.bot }}
+    needs: flutter-prep
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -44,14 +105,20 @@ jobs:
     steps:
       - name: git clone
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-
+      - name: Load Cached Flutter SDK
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./flutter-sdk
+          key: flutter-sdk-${{ runner.os }}-${{ needs.flutter-prep.outputs.latest_flutter_candidate }} 
       - name: tool/bots.sh
         env:
           BOT: ${{ matrix.bot }}
           PLATFORM: vm
         run: ./tool/bots.sh
 
   macos-test:
+    needs: flutter-prep
     name: macos ${{ matrix.bot }}
     runs-on: macos-latest
     strategy:
@@ -62,7 +129,12 @@ jobs:
     steps:
       - name: git clone
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-
+      - name: Load Cached Flutter SDK
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./flutter-sdk
+          key: flutter-sdk-${{ runner.os }}-${{ needs.flutter-prep.outputs.latest_flutter_candidate }} 
       - name: tool/bots.sh
         env:
           BOT: ${{ matrix.bot }}

tool/bots.sh

@@ -26,9 +26,11 @@ function flutter {
     fi
 }
 
-# Get Flutter.
-echo "Cloning the Flutter master branch"
-git clone https://github.com/flutter/flutter.git ./flutter-sdk
+# Make sure Flutter sdk has been provided
+if [ ! -d "./flutter-sdk" ]; then
+    echo "Expected ./flutter-sdk to exist"
+    exit 1;
+fi
 
 # Look in the dart bin dir first, then the flutter one, then the one for the
 # devtools repo. We don't use the dart script from flutter/bin as that script
@@ -39,14 +41,6 @@ export PATH=`pwd`/flutter-sdk/bin/cache/dart-sdk/bin:`pwd`/flutter-sdk/bin:`pwd`
 # Look up the latest flutter candidate (this is the latest flutter version in g3)
 # TODO(https://github.com/flutter/devtools/issues/4591): re-write this script as a
 # shell script so we won't have to incurr the cost of building flutter tool twice.
-echo "Looking up the latest Flutter candidate branch"
-pushd packages/devtools_app
-LATEST_FLUTTER_CANDIDATE=`repo_tool latest-flutter-candidate --githubToken=$AUTH_TOKEN | tail -n 1`
-popd
-
-pushd flutter-sdk
-git checkout $LATEST_FLUTTER_CANDIDATE
-popd
 
 flutter config --no-analytics
 flutter doctor

tool/latest_flutter_candidate.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+RESPONSE=$(gh api --paginate /repos/flutter/flutter/branches)
+
+CANDIDATES=$(echo "$RESPONSE" | jq '.[].name' | grep candidate)
+
+VERSIONS=$(echo "$CANDIDATES" | sed -E 's/.*([0-9]+\.[0-9]+-candidate\.[0-9]+).*/\1/' )
+
+LATEST_VERSION=$(echo "$VERSIONS" |  sort --version-sort | tail  -n 1 )
+
+if [ -z ${LATEST_VERSION+x} ]; then
+    echo "Unable to get Latest flutter candidate version"
+    exit 1
+fi
+
+LATEST_FLUTTER_CANDIDATE="flutter-$LATEST_VERSION"
+
+echo $LATEST_FLUTTER_CANDIDATE

tool/lib/repo_tool.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:args/command_runner.dart';
-import 'package:devtools_repo/commands/latest_flutter_candidate.dart';
 
 import 'commands/analyze.dart';
 import 'commands/generate_changelog.dart';
@@ -21,6 +20,5 @@ class DevToolsCommandRunner extends CommandRunner {
     addCommand(PackagesGetCommand());
     addCommand(GenerateChangelogCommand());
     addCommand(RollbackCommand());
-    addCommand(LatestFlutterCandidateCommand());
   }
 }

tool/update_flutter_sdk.sh

@@ -17,7 +17,7 @@ TOOL_DIR=`dirname "${RELATIVE_PATH_TO_SCRIPT}"`
 
 pushd "$TOOL_DIR"
 dart pub get
-REQUIRED_FLUTTER_BRANCH=`dart bin/repo_tool.dart latest-flutter-candidate | tail -n 1`
+REQUIRED_FLUTTER_BRANCH=`./latest_flutter_candidate.sh`
 
 echo "REQUIRED_FLUTTER_BRANCH: $REQUIRED_FLUTTER_BRANCH"