Skip to content

Commit

Permalink
Update flutter_plugin_tools to 0.5.0 (flutter#441)
Browse files Browse the repository at this point in the history
Rolls to the latest release of flutter_plugin_tools, updating calls for breaking changes to flags.

Other minor changes:
- Removes the default set of actions from `tool_runner.sh` since it's never used, and the set of things it runs is a very obsolete subset at this point; it's better to require people to choose specific actions.
- Renames some tasks to match recent renaming in flutter/plugins.
  • Loading branch information
stuartmorgan authored Aug 18, 2021
1 parent 5305a7c commit 035ba3e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
11 changes: 6 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tool_setup_template: &TOOL_SETUP_TEMPLATE
- git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
# Pinned version of the plugin tools, to avoid breakage in this repository
# when pushing updates from flutter/plugins.
- dart pub global activate flutter_plugin_tools 0.3.0
- dart pub global activate flutter_plugin_tools 0.5.0

flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
upgrade_flutter_script:
Expand Down Expand Up @@ -53,7 +53,7 @@ task:
script: ./script/tool_runner.sh test --exclude=flutter_image
depends_on:
- format+analyze
- name: build-apks+java-test
- name: android-build+platform-tests
env:
matrix:
CHANNEL: "master"
Expand All @@ -63,7 +63,8 @@ task:
BUILD_SHARDING: "--shardIndex 1 --shardCount 2"
script:
- ./script/tool_runner.sh build-examples --apk
- ./script/tool_runner.sh java-test # must come after apk build
# Must come after apk build:
- ./script/tool_runner.sh native-test --android --no-integration
depends_on:
- format+analyze
- name: web_benchmarks_test
Expand All @@ -78,7 +79,7 @@ task:
- dart testing/web_benchmarks_test.dart

task:
name: build-ipas
name: ios-build+platform-test
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
osx_instance:
image: big-sur-xcode-12.4
Expand All @@ -92,7 +93,7 @@ task:
BUILD_SHARDING: "--shardIndex 1 --shardCount 2"
<< : *FLUTTER_UPGRADE_TEMPLATE
build_script:
- ./script/tool_runner.sh build-examples --ipa
- ./script/tool_runner.sh build-examples --ios

task:
name: local_tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
- name: Set up tools
run: dart pub global activate flutter_plugin_tools 0.3.0
run: dart pub global activate flutter_plugin_tools 0.5.0

# # This workflow should be the last to run. So wait for all the other tests to succeed.
- name: Wait on all tests
Expand Down
4 changes: 0 additions & 4 deletions script/tool_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ set -e
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
REPO_DIR="$(dirname "$SCRIPT_DIR")"

# Set some default actions if run without arguments.
ACTIONS=("$@")
if [[ "${#ACTIONS[@]}" == 0 ]]; then
ACTIONS=("test" "analyze" "java-test")
fi

BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
if [[ "${BRANCH_NAME}" == "master" ]]; then
Expand Down

0 comments on commit 035ba3e

Please sign in to comment.