mirror of
https://codeberg.org/librewolf/source.git
synced 2025-01-03 11:20:11 -05:00
new version of bootstrap.patch
This commit is contained in:
parent
0ba7dc52df
commit
fa6c41c644
2 changed files with 90 additions and 12 deletions
|
@ -39,15 +39,91 @@
|
||||||
# put the kinds into a graph and sort topologically so that kinds are loaded
|
# put the kinds into a graph and sort topologically so that kinds are loaded
|
||||||
--- a/third_party/python/taskcluster_taskgraph/taskgraph/parameters.py
|
--- a/third_party/python/taskcluster_taskgraph/taskgraph/parameters.py
|
||||||
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/parameters.py
|
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/parameters.py
|
||||||
@@ -83,9 +83,36 @@ def _get_defaults(repo_root=None):
|
@@ -87,46 +87,77 @@ def _get_defaults(repo_root=None):
|
||||||
try:
|
repo = Mock(branch="", head_rev="", tool="git")
|
||||||
repo = get_repository(repo_path)
|
repo.get_url.return_value = ""
|
||||||
except RuntimeError:
|
|
||||||
- # Use fake values if no repo is detected.
|
- try:
|
||||||
- repo = Mock(branch="", head_rev="", tool="git")
|
- repo_url = repo.get_url()
|
||||||
- repo.get_url.return_value = ""
|
- parsed_url = mozilla_repo_urls.parse(repo_url)
|
||||||
+ # patches/bootstrap.patch - return our object from here, but
|
- project = parsed_url.repo_name
|
||||||
+ # it's possible the mock object would have sufficed.
|
- except (
|
||||||
|
- CalledProcessError,
|
||||||
|
- mozilla_repo_urls.errors.InvalidRepoUrlError,
|
||||||
|
- mozilla_repo_urls.errors.UnsupportedPlatformError,
|
||||||
|
- ):
|
||||||
|
- repo_url = ""
|
||||||
|
- project = ""
|
||||||
|
+ if repo:
|
||||||
|
+ try:
|
||||||
|
+ repo_url = repo.get_url()
|
||||||
|
+ parsed_url = mozilla_repo_urls.parse(repo_url)
|
||||||
|
+ project = parsed_url.repo_name
|
||||||
|
+ except (
|
||||||
|
+ CalledProcessError,
|
||||||
|
+ mozilla_repo_urls.errors.InvalidRepoUrlError,
|
||||||
|
+ mozilla_repo_urls.errors.UnsupportedPlatformError,
|
||||||
|
+ ):
|
||||||
|
+ repo_url = ""
|
||||||
|
+ project = ""
|
||||||
|
|
||||||
|
- return {
|
||||||
|
- "base_repository": repo_url,
|
||||||
|
- "base_ref": "",
|
||||||
|
- "base_rev": "",
|
||||||
|
- "build_date": int(time.time()),
|
||||||
|
- "build_number": 1,
|
||||||
|
- "do_not_optimize": [],
|
||||||
|
- "enable_always_target": True,
|
||||||
|
- "existing_tasks": {},
|
||||||
|
- "filters": ["target_tasks_method"],
|
||||||
|
- "head_ref": repo.branch or repo.head_rev,
|
||||||
|
- "head_repository": repo_url,
|
||||||
|
- "head_rev": repo.head_rev,
|
||||||
|
- "head_tag": "",
|
||||||
|
- "level": "3",
|
||||||
|
- "moz_build_date": datetime.now().strftime("%Y%m%d%H%M%S"),
|
||||||
|
- "next_version": None,
|
||||||
|
- "optimize_strategies": None,
|
||||||
|
- "optimize_target_tasks": True,
|
||||||
|
- "owner": "nobody@mozilla.com",
|
||||||
|
- "project": project,
|
||||||
|
- "pushdate": int(time.time()),
|
||||||
|
- "pushlog_id": "0",
|
||||||
|
- "repository_type": repo.tool,
|
||||||
|
- "target_tasks_method": "default",
|
||||||
|
- "tasks_for": "",
|
||||||
|
- "version": get_version(repo_path),
|
||||||
|
- }
|
||||||
|
+ return {
|
||||||
|
+ "base_repository": repo_url,
|
||||||
|
+ "base_ref": "",
|
||||||
|
+ "base_rev": "",
|
||||||
|
+ "build_date": int(time.time()),
|
||||||
|
+ "build_number": 1,
|
||||||
|
+ "do_not_optimize": [],
|
||||||
|
+ "enable_always_target": True,
|
||||||
|
+ "existing_tasks": {},
|
||||||
|
+ "filters": ["target_tasks_method"],
|
||||||
|
+ "head_ref": repo.branch or repo.head_rev,
|
||||||
|
+ "head_repository": repo_url,
|
||||||
|
+ "head_rev": repo.head_rev,
|
||||||
|
+ "head_tag": "",
|
||||||
|
+ "level": "3",
|
||||||
|
+ "moz_build_date": datetime.now().strftime("%Y%m%d%H%M%S"),
|
||||||
|
+ "next_version": None,
|
||||||
|
+ "optimize_strategies": None,
|
||||||
|
+ "optimize_target_tasks": True,
|
||||||
|
+ "owner": "nobody@mozilla.com",
|
||||||
|
+ "project": project,
|
||||||
|
+ "pushdate": int(time.time()),
|
||||||
|
+ "pushlog_id": "0",
|
||||||
|
+ "repository_type": repo.tool,
|
||||||
|
+ "target_tasks_method": "default",
|
||||||
|
+ "tasks_for": "",
|
||||||
|
+ "version": get_version(repo_path),
|
||||||
|
+ }
|
||||||
|
+ else:
|
||||||
+ return {
|
+ return {
|
||||||
+ "base_repository": "SOURCE",
|
+ "base_repository": "SOURCE",
|
||||||
+ "base_ref": "",
|
+ "base_ref": "",
|
||||||
|
@ -77,8 +153,10 @@
|
||||||
+ "version": "",
|
+ "version": "",
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
try:
|
|
||||||
repo_url = repo.get_url()
|
defaults_functions = [_get_defaults]
|
||||||
|
|
||||||
|
|
||||||
@@ -193,17 +223,18 @@
|
@@ -193,17 +223,18 @@
|
||||||
return os.path.splitext(os.path.basename(spec))[0]
|
return os.path.splitext(os.path.basename(spec))[0]
|
||||||
|
|
||||||
|
|
2
release
2
release
|
@ -1 +1 @@
|
||||||
2
|
3
|
||||||
|
|
Loading…
Reference in a new issue