You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
repo_build_dir=os.path.join(build_dir, be, "build")
2057
2058
repo_install_dir=os.path.join(build_dir, be, "install")
2058
2059
@@ -2110,11 +2111,11 @@ def backend_build(
2110
2111
defbackend_clone(
2111
2112
be,
2112
2113
clone_script,
2113
-
tag,
2114
+
tag_org,
2114
2115
build_dir,
2115
2116
install_dir,
2116
-
github_organization,
2117
2117
):
2118
+
tag, github_organization=tag_org
2118
2119
clone_script.commentln(8)
2119
2120
clone_script.comment(f"'{be}' backend")
2120
2121
clone_script.comment("Delete this section to remove backend from build")
@@ -2654,7 +2655,7 @@ def enable_all():
2654
2655
"--backend",
2655
2656
action="append",
2656
2657
required=False,
2657
-
help='Include specified backend in build as <backend-name>[:<repo-tag>]. If <repo-tag> starts with "pull/" then it refers to a pull-request reference, otherwise <repo-tag> indicates the git tag/branch to use for the build. If the version is non-development then the default <repo-tag> is the release branch matching the container version (e.g. version YY.MM -> branch rYY.MM); otherwise the default <repo-tag> is "main" (e.g. version YY.MMdev -> branch main).',
2658
+
help='Include specified backend in build as <backend-name>[:<repo-tag>][:<org>]. If <repo-tag> starts with "pull/" then it refers to a pull-request reference, otherwise <repo-tag> indicates the git tag/branch to use for the build. If the version is non-development then the default <repo-tag> is the release branch matching the container version (e.g. version YY.MM -> branch rYY.MM); otherwise the default <repo-tag> is "main" (e.g. version YY.MMdev -> branch main). <org> allows using a forked repository instead of the default --github-organization value.',
2658
2659
)
2659
2660
parser.add_argument(
2660
2661
"--repo-tag",
@@ -2890,11 +2891,14 @@ def enable_all():
2890
2891
# Initialize map of backends to build and repo-tag for each.
2891
2892
backends= {}
2892
2893
forbeinFLAGS.backend:
2893
-
parts=be.split(":")
2894
+
pattern=r"(https?:\/\/[^\s:]+)|:"
2895
+
parts=list(filter(None,re.split(pattern, be)))
2894
2896
iflen(parts) ==1:
2895
2897
parts.append(default_repo_tag)
2896
-
log('backend "{}" at tag/branch "{}"'.format(parts[0], parts[1]))
2897
-
backends[parts[0]] =parts[1]
2898
+
iflen(parts) ==2:
2899
+
parts.append(FLAGS.github_organization)
2900
+
log('backend "{}" at tag/branch "{}" from org "{}"'.format(parts[0], parts[1], parts[2]))
0 commit comments