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

Bump serde_json from 1.0.116 to 1.0.120 in /extension/bridge #261

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions extension/bridge/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/bridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2018"

[dependencies]
mio = { version = "0.8.11", features = ["os-poll", "net"] }
serde_json = "1.0.116"
serde_json = "1.0.120"
byteorder = "1.5.0"
8 changes: 8 additions & 0 deletions taskcluster/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ workers:
implementation: beetmover-import-from-gcs-to-artifact-registry
os: scriptworker
worker-type: 'mozillavpn-{level}-beetmover'
shipit:
provisioner: scriptworker-k8s
implementation: scriptworker-shipit
os: scriptworker
worker-type: 'mozillavpn-{level}-shipit'
succeed:
provisioner: built-in
implementation: succeed
Expand All @@ -126,3 +131,6 @@ release-promotion:
- fetch
- toolchain
- toolchain-openssl

shipit:
scope-prefix: project:mozillavpn:releng:ship-it
29 changes: 29 additions & 0 deletions taskcluster/kinds/mark-as-shipped/kind.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
---
loader: taskgraph.loader.transform:loader

transforms:
- taskgraph.transforms.from_deps
- mozillavpn_taskgraph.transforms.set_name
- mozilla_taskgraph.transforms.scriptworker.shipit.mark_as_shipped
- taskgraph.transforms.task

kind-dependencies:
- beetmover-ship

tasks:
mark-as-shipped:
worker-type: shipit
from-deps:
group-by:
attribute: shipping-phase
copy-attributes: true
unique-kinds: false
set-name: false
shipit-product:
by-build-type:
addons/opt: mozilla-vpn-addons
default: mozilla-vpn-client
run-on-tasks-for: [action]
20 changes: 20 additions & 0 deletions taskcluster/mozillavpn_taskgraph/transforms/set_name.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.dependencies import get_primary_dependency


transforms = TransformSequence()


@transforms.add
def set_name(config, tasks):
for task in tasks:
if config.kind == "mark-as-shipped":
dep = get_primary_dependency(config, task)
assert dep

product = (
"addons" if dep.attributes["build-type"] == "addons/opt" else "client"
)
task["name"] = f"mark-as-shipped-{product}"

yield task