Fixes to release process and devtools_tool(#6483)
diff --git a/.github/workflows/daily-dev-bump.yaml b/.github/workflows/daily-dev-bump.yaml index 78dd965..97cfeda 100644 --- a/.github/workflows/daily-dev-bump.yaml +++ b/.github/workflows/daily-dev-bump.yaml
@@ -54,8 +54,8 @@ dart pub get popd - dart pub global activate --source path tool - export PATH="$PATH":"$HOME/.pub-cache/bin" + # Ensure the devtools_tool command is available + export PATH="$PATH":`pwd`/tool/bin ORIGINAL_VERSION=$(devtools_tool update-version current-version) @@ -122,4 +122,3 @@ GH_TOKEN: ${{ secrets.DEVTOOLS_WORKFLOW_BOT_TOKEN }} ORIGINAL_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} IS_DRAFT: ${{ inputs.draft == true }} -
diff --git a/tool/RELEASE_INSTRUCTIONS.md b/tool/RELEASE_INSTRUCTIONS.md index ba14274..118518e 100644 --- a/tool/RELEASE_INSTRUCTIONS.md +++ b/tool/RELEASE_INSTRUCTIONS.md
@@ -28,8 +28,22 @@ > If you need to install the [Github CLI](https://cli.github.com/manual/installation) you can run: `brew install gh` -> Ensure the `devtools_tool` executable has been globally activated: -> `flutter pub global activate --source path tool` +- Ensure that you have access to `devtools_tool` + - For MacOS Users + - Ensure the `devtools_tool` executable is in your path: + - add the following to your `~/.bashrc` file. + - `export PATH=$PATH:<DEVTOOLS_DIR>/tool/bin` + > [!NOTE] + > Replace `<DEVTOOLS_DIR>` with the local path to your DevTools + > repo path. + - For Windows Users + - Ensure the `devtools_tool` executable has been globally activated: + - `flutter pub global activate --source path tool` + > [!WARNING] + > Always do this activation step before running + > `devtools_tool`. If there have been changes to the tool since the + > last time you have run the activate, then it needs to be rerun to + > pick up those changes. - Run: `devtools_tool release-helper` - This will create a PR for you using the tip of master. @@ -96,6 +110,9 @@ On each DevTools commit, DevTools is built and uploaded to CIPD. You can check the status of the builds on this [dashboard](https://ci.chromium.org/ui/p/dart-internal/builders/flutter/devtools). Within minutes, a build should be uploaded for the commit you just merged and tagged. +> [!NOTE] +> If the CIPD build times out, instructions for re-triggering can be found at [go/dart-engprod/release.md](go/dart-engprod/release.md) + ### Update the DevTools hash in the Dart SDK Run the tool script with the commit hash you just merged and tagged:
diff --git a/tool/bin/devtools_tool b/tool/bin/devtools_tool new file mode 100755 index 0000000..46426d7 --- /dev/null +++ b/tool/bin/devtools_tool
@@ -0,0 +1,3 @@ +#!/bin/bash -e +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +dart run "$SCRIPT_DIR/devtools_tool.dart" "$@"
diff --git a/tool/bots.sh b/tool/bots.sh index aa2f6d6..404c91d 100755 --- a/tool/bots.sh +++ b/tool/bots.sh
@@ -65,9 +65,9 @@ flutter pub get popd -# The `devtools_tool` executable should be available after running `flutter pub global activate` -flutter pub global activate --source path tool -export PATH="$PATH":"$HOME/.pub-cache/bin" +# Ensure the devtools_tool command is available +export PATH="$PATH":"$DEVTOOLS_DIR/tool/bin" + # Fetch dependencies devtools_tool pub-get --only-main
diff --git a/tool/lib/commands/update_dart_sdk_deps.dart b/tool/lib/commands/update_dart_sdk_deps.dart index 25a162b..f7f248a 100644 --- a/tool/lib/commands/update_dart_sdk_deps.dart +++ b/tool/lib/commands/update_dart_sdk_deps.dart
@@ -74,9 +74,7 @@ 'Update DevTools rev to $commit', ], ), - // TODO(kenz): is there a way to automatically close the file that pops up - // with the commit description? - CliCommand('git cl upload -s'), + CliCommand('git cl upload -s -f'), ], );