Bug 1932655: upgrade taskgraph to 12.1.0 r=taskgraph-reviewers,mach-r…

…eviewers,ahal Mainly to pick up taskcluster/taskgraph#604 and taskcluster/taskgraph#606 Differential Revision: https://phabricator.services.mozilla.com/D229800 UltraBlame original commit: f97cba74e8bd9653347e416ada5e077da97d6c99
marco-c · Nov 26, 2024 · 4c338ca · 4c338ca
1 parent 0dad2bc
commit 4c338ca
Show file tree

Hide file tree

Showing 14 changed files with 150 additions and 72 deletions.
diff --git a/third_party/python/pyproject.toml b/third_party/python/pyproject.toml
@@ -581,7 +581,7 @@ taskgraph
 =
 12
 .
-0
+1
 "
 "
 taskcluster

diff --git a/third_party/python/requirements.txt b/third_party/python/requirements.txt
@@ -5019,7 +5019,7 @@ taskgraph
 =
 12
 .
-0
+1
 .
 0
 \
@@ -5029,15 +5029,15 @@ hash
 =
 sha256
 :
-96a6b04bb349621664d15bbb5856018175ce85999d6e0293374603f804c7234b
+c37b0ff65ab6ae3ae322bf1ecd4d3453db01b37f22164d9a33ab77e634a34d9a
 \
 -
 -
 hash
 =
 sha256
 :
-7554e8709552918a66f03029134aa99a5c9414a839962d84c00e84ee848ab97e
+222ba9f729e6d970de8c177251e3a5f29010332d7cc6ca8967fd8c8b73fa2c1b
 taskcluster
 -
 urls

diff --git a/...uster_taskgraph-12.0.0.dist-info/METADATA → ...uster_taskgraph-12.1.0.dist-info/METADATA b/...uster_taskgraph-12.0.0.dist-info/METADATA → ...uster_taskgraph-12.1.0.dist-info/METADATA
@@ -14,7 +14,7 @@ Version
 :
 12
 .
-0
+1
 .
 0
 Summary
@@ -71,11 +71,6 @@ mozilla
 .
 com
 >
-License
--
-File
-:
-LICENSE
 Classifier
 :
 Development

diff --git a/...cluster_taskgraph-12.0.0.dist-info/RECORD → ...cluster_taskgraph-12.1.0.dist-info/RECORD b/...cluster_taskgraph-12.0.0.dist-info/RECORD → ...cluster_taskgraph-12.1.0.dist-info/RECORD
@@ -5,9 +5,7 @@ __init__
 py
 sha256
 =
-vrsuaZ4DumehJiAAPHD7O481ePEpN5N_9vuv
--
-MEZuM4
+_H9_zoYEWGO9c2L_M63SN76YWczgIqzggz_fETwqurI
 718
 taskgraph
 /
@@ -25,8 +23,8 @@ create
 py
 sha256
 =
-_zokjSM3ZaO04l2LiMhenE8qXDZVfYvueIIu5hGUhzc
-5185
+sUKEUAFp3X_1Bs99alh4jw7cFXtDFsbh4T2pAkp5mC0
+5315
 taskgraph
 /
 decision
@@ -306,10 +304,12 @@ strategies
 py
 sha256
 =
-nEiUZORwflThbuO8U7CI9IPdmEMXQTUk5var4_T
+tnyDw6
+-
+z5S2K7710Vww
 -
-jco
-3576
+EsiqtEqZl5rVYRqg8joJ1dk
+3638
 taskgraph
 /
 run
@@ -321,8 +321,8 @@ fetch
 content
 sha256
 =
-_1MWiyOChavZHSjYIweh2EGle1WGIlmwZ91GhsW0jRU
-33409
+_bBs9T6YSNfKL338XqPWmzXbDBc7YzKwG5YMmnnSYvE
+33643
 taskgraph
 /
 run
@@ -362,10 +362,8 @@ run
 task
 sha256
 =
-Cvv3L3LLX_7dL0sBPXayL5fH08Nnz0d
--
-BPUMOv8RVuY
-46161
+SS_NegHr87dWNXBx_zK2Tuq2XUMP_t__iUZ5N5rdjB4
+46229
 taskgraph
 /
 transforms
@@ -900,7 +898,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -911,17 +909,19 @@ info
 METADATA
 sha256
 =
-Mn2yTn5uqSbHq
+hHjxzh9
+-
+muODo4PH68zt0MYV2KSvF06dBBOa
 -
-sb1kFN0YIMSrUibyixqYr
+Gh5t
 -
-rMpuKug
-4947
+I
+4925
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -932,13 +932,15 @@ info
 WHEEL
 sha256
 =
-1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY
+C2FUgwZgiLbznR
+-
+k0b_5k3Ai_1aASOXDss3lzCUsUug
 87
 taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -963,7 +965,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .
@@ -982,7 +984,7 @@ taskcluster_taskgraph
 -
 12
 .
-0
+1
 .
 0
 .

diff --git a/...kcluster_taskgraph-12.0.0.dist-info/WHEEL → ...kcluster_taskgraph-12.1.0.dist-info/WHEEL b/...kcluster_taskgraph-12.0.0.dist-info/WHEEL → ...kcluster_taskgraph-12.1.0.dist-info/WHEEL
@@ -10,9 +10,9 @@ Generator
 hatchling
 1
 .
-25
+26
 .
-0
+3
 Root
 -
 Is

diff --git a/...skgraph-12.0.0.dist-info/entry_points.txt → ...skgraph-12.1.0.dist-info/entry_points.txt b/...skgraph-12.0.0.dist-info/entry_points.txt → ...skgraph-12.1.0.dist-info/entry_points.txt
diff --git a/...skgraph-12.0.0.dist-info/licenses/LICENSE → ...skgraph-12.1.0.dist-info/licenses/LICENSE b/...skgraph-12.0.0.dist-info/licenses/LICENSE → ...skgraph-12.1.0.dist-info/licenses/LICENSE
diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py b/third_party/python/taskcluster_taskgraph/taskgraph/__init__.py
@@ -3,7 +3,7 @@
 "
 12
 .
-0
+1
 .
 0
 "

diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/create.py b/third_party/python/taskcluster_taskgraph/taskgraph/create.py
@@ -3,6 +3,8 @@
 import
 logging
 import
+os
+import
 sys
 from
 concurrent
@@ -581,19 +583,47 @@
 "
 )
 
-res
+proxy_url
 =
-session
+os
 .
-put
+environ
+.
+get
 (
-f
+"
+TASKCLUSTER_PROXY_URL
+"
 "
 http
 :
 /
 /
 taskcluster
+"
+)
+.
+rstrip
+(
+
+"
+/
+"
+
+)
+
+res
+=
+session
+.
+put
+(
+
+f
+"
+{
+proxy_url
+}
 /
 queue
 /
@@ -605,9 +635,11 @@
 task_id
 }
 "
+
 json
 =
 task_def
+
 )
 
 if

diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py b/third_party/python/taskcluster_taskgraph/taskgraph/optimize/strategies.py
@@ -393,27 +393,28 @@
 get
 (
 "
-repository_type
+base_rev
 "
 )
-=
-=
-"
-hg
-"
 and
 params
 .
 get
 (
 "
-pushlog_id
+head_rev
 "
 )
 =
 =
--
-1
+params
+.
+get
+(
+"
+base_rev
+"
+)
 :
 
 return

diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content b/third_party/python/taskcluster_taskgraph/taskgraph/run-task/fetch-content
@@ -1317,12 +1317,33 @@ length
 is
 %
 d
+x
+-
+cache
+-
+status
+is
+:
+%
+s
 "
 %
 (
 url
 size
 content_length
+fh
+.
+getheader
+(
+"
+x
+-
+cache
+-
+status
+"
+)
 )
 )
 else
@@ -4636,12 +4657,12 @@ ls
 remote
 "
 repo
-'
+"
 refs
 /
 heads
 /
-'
+"
 +
 commit
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -581,7 +581,7 @@ taskgraph @@
     =
     .
     "
     "
     taskcluster
@@ Expand Down @@