Use git_branch instead of branch
Branch is reserved as a property word, so update to use git_branch in order to run with success and also to align with infra. Updates to both this recipe and the tool proxy are necessary.
Bug: b/270144322
Change-Id: I8328f0c7d08dde823e21fd061c3bc730c33fe658
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/40380
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Jesse Seales <jseales@google.com>
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta.json
index 648be88..04a81e0 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -379,7 +379,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -412,7 +412,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -441,7 +441,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_dry_run.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_dry_run.json
index 9c5a8cb..d432e81 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_dry_run.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_dry_run.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -378,7 +378,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -411,7 +411,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -439,7 +439,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable.json
index c03b3a3..3b69ed7 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -379,7 +379,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -412,7 +412,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -441,7 +441,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable_dry_run.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable_dry_run.json
index cae1b39..5ab8c83 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable_dry_run.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_stable_dry_run.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -378,7 +378,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -411,7 +411,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -439,7 +439,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta.json
index 00d910c..ecb2677 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -379,7 +379,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -412,7 +412,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -441,7 +441,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta_dry_run.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta_dry_run.json
index 7fa8630..01bd2a3 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta_dry_run.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_beta_dry_run.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -378,7 +378,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -411,7 +411,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -439,7 +439,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable.json
index f5ee9e1..dbcb282 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -379,7 +379,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -412,7 +412,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -441,7 +441,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_dry_run.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_dry_run.json
index 7c3d874..b98de44 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_dry_run.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_dry_run.json
@@ -178,7 +178,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -224,7 +224,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -256,7 +256,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -288,7 +288,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -321,7 +321,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -349,7 +349,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -378,7 +378,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -411,7 +411,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
@@ -439,7 +439,7 @@
"cwd": "[START_DIR]/flutter",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "",
+ "GIT_BRANCH": "flutter-2.8-candidate.9",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
"LUCI_PR": "",
diff --git a/recipes/release/release_publish.py b/recipes/release/release_publish.py
index 53ce2c4..f4340a9 100644
--- a/recipes/release/release_publish.py
+++ b/recipes/release/release_publish.py
@@ -35,19 +35,19 @@
Because of this configuration, the recipe is triggered manually during the
release process.
-It is expected that a valid release branch, tag, and release_channel are passed
+It is expected that a valid release git branch, tag, and release_channel are passed
to the recipe.
The recipe will tag and push to github unless triggered
from an experimental run.
"""
def RunSteps(api):
- branch = api.properties.get('branch')
+ git_branch = api.properties.get('git_branch')
tag = api.properties.get('tag')
release_channel = api.properties.get('release_channel')
# default to True dry run
dry_run = api.runtime.is_experimental or api.properties.get('dry_run')=='True'
- assert branch and tag and release_channel
+ assert git_branch and tag and release_channel
checkout_path = api.path['start_dir'].join('flutter')
git_url = 'https://github.com/flutter/flutter'
@@ -64,7 +64,7 @@
'flutter',
checkout_path=checkout_path,
url=git_url,
- ref="refs/heads/%s" % branch,
+ ref="refs/heads/%s" % git_branch,
)
env, env_prefixes = api.repo_util.flutter_environment(checkout_path)
@@ -100,7 +100,7 @@
'rev-list',
'-n',
'1',
- f'origin/{branch}',
+ f'origin/{git_branch}',
stdout=api.raw_io.output_text(add_output_log=True)).stdout.rstrip()
# push tag
@@ -133,7 +133,7 @@
'_dry_run' if dry_run=='True' else ''
), api.platform('mac', 64),
api.properties(
- branch='flutter-2.8-candidate.9',
+ git_branch='flutter-2.8-candidate.9',
tag=tag,
release_channel=release_channel,
dry_run=dry_run
