Fix release candidate branch detection. The remote branches were not being detected correctly because they were prefixed with white spaces. This will also fix the problems with codesigning. Bug: https://github.com/flutter/flutter/issues/131942 Change-Id: I5a734c81a46e6bdf24e278d201784abaf239ca8b Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/48980 Reviewed-by: Xilai Zhang <xilaizhang@google.com> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/adhoc_validation/api.py b/recipe_modules/adhoc_validation/api.py index f6a66bc..b04cb8c 100644 --- a/recipe_modules/adhoc_validation/api.py +++ b/recipe_modules/adhoc_validation/api.py
@@ -79,7 +79,6 @@ ) and self.m.repo_util.is_release_candidate_branch(checkout_path): env['LUCI_BRANCH'] = 'stable' env['LUCI_CI'] = True - with self.m.context(env=env, env_prefixes=env_prefixes): self.m.flutter_bcid.report_stage(BcidStage.COMPILE.value) self.m.file.read_text(
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json b/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json index f9510af..c43b769 100644 --- a/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json +++ b/recipe_modules/adhoc_validation/examples/full.expected/mac_nodeps.json
@@ -116,120 +116,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter sdk", - "env": { - "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "darwin", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter sdk/bin", - "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin" - ] - }, - "name": "Docs.Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter sdk", - "env": { - "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "darwin", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter sdk/bin", - "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin" - ] - }, - "name": "Docs.Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are " - ], - "env": { - "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "darwin", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter sdk/bin", - "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin" - ] - }, - "name": "Docs.print commit branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "current branches are not considered release branches" - ], - "env": { - "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "darwin", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter sdk/bin", - "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin" - ] - }, - "name": "Docs.check if release branch", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "vpython3", "-u", "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py index 99723ac..5ddf773 100644 --- a/recipe_modules/repo_util/api.py +++ b/recipe_modules/repo_util/api.py
@@ -320,7 +320,6 @@ return gitiles_commit return self.m.properties.get('git_ref', 'led') - # TODO(xilaizhang): remove print statements after release branch logic is fixed. def current_commit_branches(self, checkout_path): """Gets the list of branches for the current commit.""" with self.m.step.nest('Identify branches'): @@ -333,14 +332,13 @@ commit, stdout=self.m.raw_io.output_text() ).stdout.splitlines() - if self.m.platform.is_mac: - self.m.step("print identified branches", ["echo", "identified branches before filter are "+" ".join(branches)]) # Discard local branches as we are interested only in remote branches. - branches = [b for b in branches if b.startswith('remotes/origin/')] - if self.m.platform.is_mac: - self.m.step("print identified branches", ["echo", "identified branches after filter are "+" ".join(branches)]) - return [b.strip().replace('remotes/origin/', '') for b in branches - ] or [] + branches = [ + b.strip() + for b in branches + if b.strip().startswith('remotes/origin/') + ] + return [b.replace('remotes/origin/', '') for b in branches] or [] def get_branch(self, checkout_path): """Get git branch for beta and stable channels. @@ -360,12 +358,7 @@ """ if self.m.properties.get('git_branch', '') in ['beta', 'stable']: branches = self.current_commit_branches(checkout_path) - # TODO(xilaizhang): remove print statements after codesigning logic can be triggered from beta. - if self.m.platform.is_mac: - self.m.step("print branches", ["echo", "branches before filtering are "+" ".join(branches)]) branches = [b for b in branches if b.startswith('flutter')] - if self.m.platform.is_mac: - self.m.step("print branches", ["echo", "branches after filtering are "+" ".join(branches)]) return branches[0] if len(branches) > 0 else self.m.properties.get( 'git_branch', '' ) @@ -524,19 +517,12 @@ assert checkout_path, 'Outside of a flutter_environment?' return self.m.path.abs_to_path(checkout_path) - # TODO(xilaizhang): remove print statements after release branch logic is fixed. def is_release_candidate_branch(self, checkout_path): """Returns true if the branch starts with "flutter-".""" commit_branches = self.current_commit_branches(checkout_path) - if self.m.platform.is_mac: - self.m.step("print commit branches", ["echo", "commit branches are "+" ".join(commit_branches)]) for branch in commit_branches: if branch.startswith('flutter-'): - if self.m.platform.is_mac: - self.m.step("check if release branch", ["echo", "current branches are verdicted as release branches"]) return True - if self.m.platform.is_mac: - self.m.step("check if release branch", ["echo", "current branches are not considered release branches"]) return False def release_candidate_branch(self, checkout_path):
diff --git a/recipe_modules/repo_util/examples/full.expected/basic.json b/recipe_modules/repo_util/examples/full.expected/basic.json index 28cb35e..d390ac4 100644 --- a/recipe_modules/repo_util/examples/full.expected/basic.json +++ b/recipe_modules/repo_util/examples/full.expected/basic.json
@@ -32,42 +32,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are flutter-3.2-candidate.5" - ], - "name": "print branches" - }, - { - "cmd": [ - "echo", - "branches after filtering are flutter-3.2-candidate.5" - ], - "name": "print branches (2)" - }, - { "cmd": [], "name": "Identify branches (2)" }, @@ -100,42 +64,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (2).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (2).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are flutter-3.2-candidate.5" - ], - "name": "print commit branches" - }, - { - "cmd": [ - "echo", - "current branches are verdicted as release branches" - ], - "name": "check if release branch" - }, - { "cmd": [], "name": "Identify branches (3)" }, @@ -168,28 +96,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (3).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (3).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [], "name": "Checkout flutter/flutter" }, @@ -777,42 +683,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "name": "Identify branches (4).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "name": "Identify branches (4).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "name": "print branches (3)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "name": "print branches (4)" - }, - { "cmd": [], "name": "Identify branches (5)" }, @@ -845,42 +715,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "name": "Identify branches (5).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "name": "Identify branches (5).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "name": "print branches (5)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "name": "print branches (6)" - }, - { "cmd": [], "name": "Identify branches (6)" }, @@ -914,42 +748,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (6).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (6).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "name": "print branches (7)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "name": "print branches (8)" - }, - { - "cmd": [ "git", "rev-parse", "HEAD" @@ -992,28 +790,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (7).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "name": "Identify branches (7).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "vpython3", "-u", "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json index b276ff6..bb5e949 100644 --- a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json +++ b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
@@ -56,90 +56,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (2)" - }, - { "cmd": [], "name": "Identify branches (2)" }, @@ -196,90 +112,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (2).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (2).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print commit branches" - }, - { - "cmd": [ - "echo", - "current branches are not considered release branches" - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "check if release branch" - }, - { "cmd": [], "name": "Identify branches (3)" }, @@ -336,52 +168,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (3).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (3).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [], "name": "Checkout flutter/flutter" }, @@ -1412,90 +1198,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (4).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (4).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (3)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (4)" - }, - { "cmd": [], "name": "Identify branches (5)" }, @@ -1552,90 +1254,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (5).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (5).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (5)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (6)" - }, - { "cmd": [], "name": "Identify branches (6)" }, @@ -1693,90 +1311,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (6).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (6).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "branches before filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (7)" - }, - { - "cmd": [ - "echo", - "branches after filtering are " - ], - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print branches (8)" - }, - { - "cmd": [ "git", "rev-parse", "HEAD" @@ -1855,52 +1389,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (7).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/flutter", - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (7).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "vpython3", "-u", "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json index 697755f..0221440 100644 --- a/recipes/engine_v2/builder.expected/mac.json +++ b/recipes/engine_v2/builder.expected/mac.json
@@ -2864,204 +2864,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[CACHE]/builder/src/flutter", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1", - "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "ENGINE_CHECKOUT_PATH": "[CACHE]/builder", - "ENGINE_PATH": "[CACHE]/builder", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "LUCI_WORKDIR": "[START_DIR]", - "OS": "darwin", - "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[CACHE]/builder/src/flutter", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1", - "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "ENGINE_CHECKOUT_PATH": "[CACHE]/builder", - "ENGINE_PATH": "[CACHE]/builder", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "LUCI_WORKDIR": "[START_DIR]", - "OS": "darwin", - "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are flutter-3.2-candidate.5" - ], - "cwd": "[CACHE]/builder/src/flutter", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1", - "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "ENGINE_CHECKOUT_PATH": "[CACHE]/builder", - "ENGINE_PATH": "[CACHE]/builder", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "LUCI_WORKDIR": "[START_DIR]", - "OS": "darwin", - "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print commit branches" - }, - { - "cmd": [ - "echo", - "current branches are verdicted as release branches" - ], - "cwd": "[CACHE]/builder/src/flutter", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1", - "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android", - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "ENGINE_CHECKOUT_PATH": "[CACHE]/builder", - "ENGINE_PATH": "[CACHE]/builder", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "LUCI_WORKDIR": "[START_DIR]", - "OS": "darwin", - "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "check if release branch" - }, - { - "cmd": [ "python3", "RECIPE_MODULE[flutter::zip]/resources/namelist.py" ],
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json index d4beafc..5f2fb86 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_mac.json +++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -1164,96 +1164,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are " - ], - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.print commit branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "current branches are not considered release branches" - ], - "luci_context": { - "realm": { - "name": "flutter:prod" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.check if release branch", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "python3", "RECIPE_MODULE[flutter::zip]/resources/namelist.py" ],
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json index 06da081..d13afd8 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json +++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -1241,96 +1241,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "dart-internal:flutter" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "dart-internal:flutter" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are " - ], - "luci_context": { - "realm": { - "name": "dart-internal:flutter" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.print commit branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "current branches are not considered release branches" - ], - "luci_context": { - "realm": { - "name": "dart-internal:flutter" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.check if release branch", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "python3", "RECIPE_MODULE[flutter::zip]/resources/namelist.py" ],
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json index 652c707..1e0cfa5 100644 --- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json +++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -339,90 +339,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/engine", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[START_DIR]/engine", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are flutter-3.2-candidate.5" - ], - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "print commit branches" - }, - { - "cmd": [ - "echo", - "current branches are verdicted as release branches" - ], - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "check if release branch" - }, - { "cmd": [], "name": "Identify branches (2)" }, @@ -479,52 +395,6 @@ ] }, { - "cmd": [ - "echo", - "identified branches before filter are " - ], - "cwd": "[START_DIR]/engine", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (2).print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are " - ], - "cwd": "[START_DIR]/engine", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Identify branches (2).print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [], "name": "launch builds" }, @@ -1767,96 +1637,6 @@ }, { "cmd": [ - "echo", - "identified branches before filter are branch1 branch2 remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "identified branches after filter are remotes/origin/flutter-3.2-candidate.5" - ], - "cwd": "[CACHE]/builder/src/flutter", - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.Identify branches.print identified branches (2)", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "echo", - "commit branches are flutter-3.2-candidate.5" - ], - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.print commit branches", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "echo", - "current branches are verdicted as release branches" - ], - "luci_context": { - "realm": { - "name": "proj:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Global generators.check if release branch", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ "python3", "RECIPE_MODULE[flutter::zip]/resources/namelist.py" ],