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.

Sign up for GitHub

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

Jump to bottom

Matrix in CI and mach try with presets #31141

Merged
merged 14 commits into from Jan 26, 2024
Merged

Matrix in CI and mach try with presets #31141

merged 14 commits into from Jan 26, 2024

Conversation

sagudev
Copy link
Member

@sagudev sagudev commented Jan 20, 2024

Splitted from #30920

This PR replaces try branches with single try branch that accepts configuration (that is encoded in last line of commit in JSON). try_parser.py is there just to have preset -> JSON in one place (try label = preset).

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #___ (GitHub issue number if applicable)
  • There are tests for these changes OR
  • These changes do not require tests because ___

mrobinson
mrobinson reviewed Jan 20, 2024
View reviewed changes
Copy link
Member

@mrobinson mrobinson left a comment

Choose a reason for hiding this comment

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

I know this is just a draft, but this is looking really nice.

etc/try_parser.py Outdated Show resolved Hide resolved
etc/try_parser.py Outdated Show resolved Hide resolved
etc/try_parser.py Outdated Show resolved Hide resolved
etc/try_parser.py Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Show resolved Hide resolved
.github/workflows/dispatch-os.yml Outdated Show resolved Hide resolved
etc/try_parser.py Outdated Show resolved Hide resolved
etc/try_parser.py Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
@sagudev
Copy link
Member Author

sagudev commented Jan 20, 2024 •
edited

The only reason this is still draft is because I want to retest some usages (mainly labels runs).

@sagudev sagudev marked this pull request as ready for review January 21, 2024 14:55
mrobinson
mrobinson requested changes Jan 22, 2024
View reviewed changes
.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Outdated Show resolved Hide resolved
python/try_parser.py Outdated Show resolved Hide resolved
python/try_parser.py Outdated Show resolved Hide resolved
python/try_parser.py Outdated Show resolved Hide resolved
python/try_parser.py Outdated Show resolved Hide resolved
python/try_parser.py Outdated Show resolved Hide resolved
@sagudev
Copy link
Member Author

sagudev commented Jan 23, 2024

I am working on rebase with android support. I also plan to rename matrix config field from os to workflow as it will be more accurate.

@servo-wpt-sync
Copy link
Collaborator

🛠 These changes could not be applied onto the latest upstream WPT. Servo's copy of the Web Platform Tests may be out of sync.

@sagudev sagudev marked this pull request as draft January 24, 2024 06:56
@sagudev sagudev force-pushed the matrixed-ci branch 3 times, most recently from edb0f9c to 59faed3 Compare January 24, 2024 09:38
mrobinson
mrobinson reviewed Jan 24, 2024
View reviewed changes
Copy link
Member

@mrobinson mrobinson left a comment

Choose a reason for hiding this comment

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

Is this ready for another review?

python/servo/try_parser.py Outdated Show resolved Hide resolved
python/servo/try_parser.py Outdated Show resolved Hide resolved
@sagudev
Copy link
Member Author

sagudev commented Jan 25, 2024

This is generally ready for review, but I need to retest some common use-cases to be sure it works right, hence draft.

@sagudev sagudev marked this pull request as ready for review January 25, 2024 10:26
@sagudev
Copy link
Member Author

sagudev commented Jan 25, 2024

I think it's ready!

@sagudev sagudev mentioned this pull request Jan 25, 2024
Closed
mrobinson
mrobinson approved these changes Jan 26, 2024
View reviewed changes
Copy link
Member

@mrobinson mrobinson left a comment

Choose a reason for hiding this comment

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

Thanks for all your work here! This looks good, but I have some comments that should be addressed before landing.

.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try.yml Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
.github/workflows/try_labels.yml Outdated Show resolved Hide resolved
python/servo/devenv_commands.py Outdated Show resolved Hide resolved
python/servo/try_parser.py Outdated Show resolved Hide resolved
python/servo/try_parser.py Outdated Show resolved Hide resolved
@sagudev sagudev added this pull request to the merge queue Jan 26, 2024
@sagudev sagudev mentioned this pull request Jan 26, 2024
Closed
4 tasks
Merged via the queue into servo:main with commit a5c5128 Jan 26, 2024
10 checks passed
@sagudev sagudev deleted the matrixed-ci branch January 26, 2024 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrobinson mrobinson mrobinson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sagudev @servo-wpt-sync @mrobinson