Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Bump Taskgraph to 7.0.0 #8776

Merged
merged 1 commit into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ tasks:

# Note: This task is built server side without the context or tooling that
# exist in tree so we must hard code the hash
image: mozillareleases/taskgraph:decision-d1ddb5593679cec9d7d2cdd8e9b8e2228b14ebe9b844411276cc3cfe37d189aa@sha256:b236321d98367f9cdbbd28c47bad7c0df34884897b75d266185d2e9e569ac0fa
image: mozillareleases/taskgraph:decision-c4ac262880970ca484105929e02dd12f00214d5f2603ab6ce4c0d17de5cd0280@sha256:2dd667994aa13fccdcdcede85c570a5eb4a5247e42875a9e95a135ef774ee469

maxRunTime: 1800

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ loader: taskgraph.loader.transform:loader

transforms:
- mozillavpn_taskgraph.transforms.release_index:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

tasks:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ transforms:
- mozillavpn_taskgraph.transforms.requires_level:transforms
- mozillavpn_taskgraph.transforms.build:transforms
- mozilla_taskgraph.transforms.scriptworker.release_artifacts:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

kind-dependencies:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ loader: taskgraph.loader.transform:loader

transforms:
- taskgraph.transforms.fetch:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

task-defaults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ loader: taskgraph.loader.transform:loader
transforms:
- mozillavpn_taskgraph.transforms.requires_level:transforms
- mozillavpn_taskgraph.transforms.release_index:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

kind-dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ loader: taskgraph.loader.transform:loader

transforms:
- mozilla_taskgraph.transforms.scriptworker.release_artifacts:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

kind-dependencies:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
loader: taskgraph.loader.transform:loader

transforms:
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.task:transforms

tasks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ kind-dependencies:
- fetch

transforms:
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.cached_tasks:transforms
- taskgraph.transforms.task:transforms

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kind-dependencies:

transforms:
- mozillavpn_taskgraph.transforms.conda:transforms
- taskgraph.transforms.job:transforms
- taskgraph.transforms.run:transforms
- taskgraph.transforms.cached_tasks:transforms
- taskgraph.transforms.task:transforms

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions taskcluster/mozillavpn_taskgraph/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from taskgraph.transforms.job import run_job_using, configure_taskdesc_for_run
from taskgraph.transforms.run import run_task_using, configure_taskdesc_for_run
from taskgraph.util.schema import Schema, taskref_or_string
from voluptuous import Required, Optional

Expand All @@ -27,7 +27,7 @@
)


@run_job_using("docker-worker", "run-commands", schema=run_commands_schema)
@run_task_using("docker-worker", "run-commands", schema=run_commands_schema)
def configure_run_commands_schema(config, job, taskdesc):
run = job["run"]
pre_commands = run.pop("pre-commands", [])
Expand Down
6 changes: 3 additions & 3 deletions taskcluster/mozillavpn_taskgraph/target_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from taskgraph.target_tasks import _target_task
from taskgraph.target_tasks import register_target_task


@_target_task("addons-target-tasks")
@register_target_task("addons-target-tasks")
def addons_target_tasks(full_task_graph, parameters, graph_config):
def filter(task):
if (
Expand All @@ -17,7 +17,7 @@ def filter(task):
return [label for label, task in full_task_graph.tasks.items() if filter(task)]


@_target_task("client-target-tasks")
@register_target_task("client-target-tasks")
def client_target_tasks(full_task_graph, parameters, graph_config):
def filter(task):
if (
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# For instructions on managing dependencies, see:
# https://taskcluster-taskgraph.readthedocs.io/en/latest/howto/bootstrap-taskgraph.html

taskcluster-taskgraph >= 6.3.1
mozilla-taskgraph ~= 1.0.2
taskcluster-taskgraph >= 7.0.0
mozilla-taskgraph >= 1.0.2
10 changes: 5 additions & 5 deletions taskcluster/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes requirements.in
# pip-compile --generate-hashes
#
appdirs==1.4.4 \
--hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \
Expand Down Expand Up @@ -281,9 +281,9 @@ slugid==2.0.0 \
--hash=sha256:a950d98b72691178bdd4d6c52743c4a2aa039207cf7a97d71060a111ff9ba297 \
--hash=sha256:aec8b0e01c4ad32e38e12d609eab3ec912fd129aaf6b2ded0199b56a5f8fd67c
# via taskcluster-taskgraph
taskcluster-taskgraph==6.3.1 \
--hash=sha256:3bc2d62a6b07eae8426038135f9818cdc58631a55ff1b09dc95b50f7e0d12e94 \
--hash=sha256:ee32ba67af19c31039ecd90531528e055b4b2d60fac88d3f457d9d2dcfedc107
taskcluster-taskgraph==7.0.0 \
--hash=sha256:1553e1ae7709296643701faedafc8fc1e4a9b546f2ed270445ebd025d74101bf \
--hash=sha256:9fa7fb1ccbf1b2e607117d599de3ea82fff71dbf732124216ac6c16bf19c3127
# via
# -r requirements.in
# mozilla-taskgraph
Expand Down
Loading