From 229a1623dc278b2d387bb5969250102b2cdfade9 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 30 Aug 2023 12:19:00 -0400 Subject: [PATCH 1/9] point specifically to repo --- tool/release_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index eff15336792..e7bde7701ac 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -50,7 +50,7 @@ git push -u $DEVTOOLS_REMOTE $RELEASE_BRANCH echo "Creating the PR" echo -PR_URL=$(gh pr create --draft --title "$COMMIT_MESSAGE" $CREATION_FLAGS) +PR_URL=$(gh pr create --repo flutter/devtools --draft --title "$COMMIT_MESSAGE" $CREATION_FLAGS) echo "Updating your flutter version to the most recent candidate." From ca78b180bae0556dfc0844d04a0fc227b6e51fd1 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 30 Aug 2023 12:23:12 -0400 Subject: [PATCH 2/9] add x for now --- tool/release_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index e7bde7701ac..3c4b6ded010 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash -ex DEVTOOLS_REMOTE=$(git remote -v | grep "flutter/devtools.git" | grep "(fetch)"| tail -n1 | cut -w -f1) From 2fb722de31742246be0ed25bc5e5a92b2b66d04e Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 30 Aug 2023 12:26:32 -0400 Subject: [PATCH 3/9] add dummy commit --- tool/release_helper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index 3c4b6ded010..88d56e94c2d 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -41,6 +41,7 @@ dart tool/update_version.dart auto --type release NEW_VERSION=$(dart tool/update_version.dart current-version) COMMIT_MESSAGE="Releasing from $ORIGINAL_VERSION to $NEW_VERSION" +echo "test" >> pubspec.yaml # Stage the file, commit and push git commit -a -m "$COMMIT_MESSAGE" From 51b117e6fdc346f28187e6ad429ec2b0e27c17d0 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 30 Aug 2023 12:29:58 -0400 Subject: [PATCH 4/9] better targ --- tool/release_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index 88d56e94c2d..7885f0a2c2c 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -41,7 +41,7 @@ dart tool/update_version.dart auto --type release NEW_VERSION=$(dart tool/update_version.dart current-version) COMMIT_MESSAGE="Releasing from $ORIGINAL_VERSION to $NEW_VERSION" -echo "test" >> pubspec.yaml +echo "test" >> README.md # Stage the file, commit and push git commit -a -m "$COMMIT_MESSAGE" From 91d1082b991e458f7bdc07b72c8d1e00adb6817d Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Wed, 30 Aug 2023 12:32:43 -0400 Subject: [PATCH 5/9] fill --- tool/release_helper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index 7885f0a2c2c..ee4e406a939 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e DEVTOOLS_REMOTE=$(git remote -v | grep "flutter/devtools.git" | grep "(fetch)"| tail -n1 | cut -w -f1) @@ -51,7 +51,7 @@ git push -u $DEVTOOLS_REMOTE $RELEASE_BRANCH echo "Creating the PR" echo -PR_URL=$(gh pr create --repo flutter/devtools --draft --title "$COMMIT_MESSAGE" $CREATION_FLAGS) +PR_URL=$(gh pr create --repo flutter/devtools --draft --title "$COMMIT_MESSAGE" --fill "$CREATION_FLAGS") echo "Updating your flutter version to the most recent candidate." From ea2f7d69101d1488490445a6cae925956c3746c4 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Tue, 5 Sep 2023 09:58:18 -0400 Subject: [PATCH 6/9] no more fill arg --- tool/release_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index ee4e406a939..85ba3ced4eb 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -51,7 +51,7 @@ git push -u $DEVTOOLS_REMOTE $RELEASE_BRANCH echo "Creating the PR" echo -PR_URL=$(gh pr create --repo flutter/devtools --draft --title "$COMMIT_MESSAGE" --fill "$CREATION_FLAGS") +PR_URL=$(gh pr create --repo flutter/devtools --draft --title "$COMMIT_MESSAGE" --fill) echo "Updating your flutter version to the most recent candidate." From 36a153ffc331bc07e84d57a211d1df5a6dcc9768 Mon Sep 17 00:00:00 2001 From: Dan Chevalier Date: Tue, 5 Sep 2023 10:03:57 -0400 Subject: [PATCH 7/9] cleanup --- tool/release_helper.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index 85ba3ced4eb..176fec481ec 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -41,7 +41,6 @@ dart tool/update_version.dart auto --type release NEW_VERSION=$(dart tool/update_version.dart current-version) COMMIT_MESSAGE="Releasing from $ORIGINAL_VERSION to $NEW_VERSION" -echo "test" >> README.md # Stage the file, commit and push git commit -a -m "$COMMIT_MESSAGE" @@ -60,4 +59,6 @@ echo echo "Your Draft release PR can be found at: $PR_URL" echo -echo "$0 DONE: Build, run and test this release using: `dart ./tool/build_e2e.dart`" \ No newline at end of file +echo "$0 DONE: Build, run and test this release using: `dart ./tool/build_e2e.dart`" + +exit \ No newline at end of file From 0769aa3a96ceffeea23c6abc00be234650435a9d Mon Sep 17 00:00:00 2001 From: Daniel Chevalier Date: Tue, 5 Sep 2023 11:18:18 -0400 Subject: [PATCH 8/9] Apply suggestions from code review --- tool/release_helper.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index 176fec481ec..5dcbaf951b4 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -59,6 +59,4 @@ echo echo "Your Draft release PR can be found at: $PR_URL" echo -echo "$0 DONE: Build, run and test this release using: `dart ./tool/build_e2e.dart`" - -exit \ No newline at end of file +echo "$0 DONE: Build, run and test this release using: 'dart ./tool/build_e2e.dart'" From af9e65f520b262ff624e5200dcb367f2489b2034 Mon Sep 17 00:00:00 2001 From: Daniel Chevalier Date: Tue, 5 Sep 2023 12:56:02 -0400 Subject: [PATCH 9/9] Update tool/release_helper.sh --- tool/release_helper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/release_helper.sh b/tool/release_helper.sh index e419323a311..6969c33d2f0 100755 --- a/tool/release_helper.sh +++ b/tool/release_helper.sh @@ -59,5 +59,5 @@ echo echo "$0: Your Draft release PR can be found at: $PR_URL" echo echo "$0: DONE. -echo "$0 DONE: Build, run and test this release using: 'dart ./tool/build_e2e.dart'" +echo "$0: Build, run and test this release using: 'dart ./tool/build_e2e.dart'"