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

Upstream some fixes in taskgraph.util.templates from gecko_taskgraph #516

Merged
merged 2 commits into from
Jun 11, 2024

Conversation

ahal
Copy link
Collaborator

@ahal ahal commented Jun 7, 2024

This upstreams a pair of changes to this file, one of which is breaking.

BREAKING CHANGE: This can impact how `task-defaults` gets merged into
each task definition.

The default merge behaviour would mix the `by-<key>` key in with
non-keyed-by configs. This is a bug and certainly not what the user
would be expecting.

It is possible that the user intended to mix two `by-<key>` configs
together, but this case should be extremely rare.

This is a port of the following `gecko_taskgraph` patch:
https://hg.mozilla.org/mozilla-central/rev/0fe5ffc10ff8488d780c5c3cbcff1b43ca974cf7
@ahal ahal added the BREAKING CHANGE Backwards incompatible request that will require major version bump label Jun 7, 2024
@ahal ahal requested a review from a team June 7, 2024 20:31
@ahal ahal self-assigned this Jun 7, 2024
@ahal ahal requested a review from hneiva June 7, 2024 20:31
And use it in `util.templates.merge`.

This is a port of the following patch in `gecko_taskgraph`:
https://hg.mozilla.org/mozilla-central/rev/fa2cdac6989ac78d606d8f8adb10d826a6e50429
Copy link
Contributor

@hneiva hneiva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ahal ahal merged commit f6bd78a into taskcluster:main Jun 11, 2024
11 checks passed
@ahal ahal deleted the util_merge branch June 11, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BREAKING CHANGE Backwards incompatible request that will require major version bump
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants