From a7e3410f3d5a9f1f7a46967aa45c8d05f5f1bd06 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Mon, 10 Oct 2022 18:03:17 -0400 Subject: [PATCH] [ci] Roll repo tooling to 0.12.0 (#2699) --- .ci/scripts/prepare_tool.sh | 2 +- .cirrus.yml | 8 +------- .github/workflows/release.yml | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh index 262d093bb9..ddd2092532 100755 --- a/.ci/scripts/prepare_tool.sh +++ b/.ci/scripts/prepare_tool.sh @@ -8,4 +8,4 @@ git fetch origin main # 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.9.2 +dart pub global activate flutter_plugin_tools 0.12.0 diff --git a/.cirrus.yml b/.cirrus.yml index 1c059b60f6..73b27908e8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -126,11 +126,6 @@ task: analyze_script: - ./script/tool_runner.sh analyze --downgrade --custom-analysis=script/configs/custom_analysis.yaml - name: publishable - env: - # TODO(stuartmorgan): Remove once the fix for https://github.com/dart-lang/pub/issues/3152 - # rolls into Flutter master. - CHANNEL: stable - CHANGE_DESC: "/tmp/change-description.txt" version_script: # For pre-submit, pass the PR description to the script to allow for # version check overrides. @@ -141,8 +136,7 @@ task: - if [[ $CIRRUS_PR == "" ]]; then - ./script/tool_runner.sh version-check - else - - echo "$CIRRUS_CHANGE_MESSAGE" > "$CHANGE_DESC" - - ./script/tool_runner.sh version-check --check-for-missing-changes --change-description-file="$CHANGE_DESC" --pr-labels="$CIRRUS_PR_LABELS" + - ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS" - fi publishable_script: ./script/tool_runner.sh publish-check --allow-pre-release depends_on: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45420f8517..dc75cadf7a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,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.9.2 + run: dart pub global activate flutter_plugin_tools 0.12.0 # # This workflow should be the last to run. So wait for all the other tests to succeed. - name: Wait on all tests @@ -47,6 +47,6 @@ jobs: run: | git config --global user.name ${{ secrets.USER_NAME }} git config --global user.email ${{ secrets.USER_EMAIL }} - dart pub global run flutter_plugin_tools publish-plugin --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin + dart pub global run flutter_plugin_tools publish --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin env: {PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"}