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

github: clean up and consolidate the build matrix #5598

Merged
merged 8 commits into from
Feb 11, 2025

Conversation

thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Feb 5, 2025

This makes the existing build matrix much more "regular" and makes it easier to navigate by consolidating everything under the main build workflow. Here's an example of the results: https://github.com/jj-vcs/jj/actions/runs/13180977716

This requires a mass rename of all the required checks, so @martinvonz will have to take over.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@thoughtpolice
Copy link
Member Author

This also contains an update to use macOS-14 on ARM to build x86 binaries to keep the build matrix more regular. It's still faster than Windows. :') I can pull that out, but I think migrating off macos-13 is probably a good idea in general.

.github/workflows/build.yml Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
@thoughtpolice thoughtpolice force-pushed the aseipp/push-vslxsypqtwlv branch from 64ae60d to 33960d5 Compare February 5, 2025 23:52
Copy link
Contributor

@ilyagr ilyagr left a comment

Choose a reason for hiding this comment

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

Thank you for working on this!

.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
@thoughtpolice thoughtpolice force-pushed the aseipp/push-vslxsypqtwlv branch 3 times, most recently from f37007d to 0249c77 Compare February 6, 2025 15:59
This makes the methods and the madness a little more consistent with
each other, so it's easier to read and categorize build reports in the
GHA UX.

No functional change, but requires updating rulesets upstream.

Signed-off-by: Austin Seipp <[email protected]>
There's no real reason to keep these separate and it makes the build UX
easier to navigate, too; as well as see what the actual "global" slowest
builds across all workflows easier to see.

Signed-off-by: Austin Seipp <[email protected]>
Just a rename; now that `build` and `build-nix` are unified, this makes
it more clear this workflow is conceptually separate. NFC.

Signed-off-by: Austin Seipp <[email protected]>
Moves all the Windows junk out of the way, where it can be encapsulated.

Signed-off-by: Austin Seipp <[email protected]>
'ci' is much more high-level and accurately explains what the jobs in
this test should be for. It's much more applicable than 'test' (testing
what? on what platforms?) or 'build' (does it only build? or test? or
run linters?)

Signed-off-by: Austin Seipp <[email protected]>
The CI system is variously hitting the limits of the existing 15 minute
build mark; in particular, Windows seems to be consistently hitting ~14m
so the chance of a runner timing out gets high if the underlying load is
also high.

While I'm working on this, let's just (regrettably) increase the slack
on the timeout so that everyone else isn't disturbed.

Signed-off-by: Austin Seipp <[email protected]>
@thoughtpolice thoughtpolice force-pushed the aseipp/push-vslxsypqtwlv branch from 0249c77 to 0a9f96c Compare February 10, 2025 18:16
Copy link
Contributor

@ilyagr ilyagr left a comment

Choose a reason for hiding this comment

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

Looks good, at a glance. Thank you!

@martinvonz martinvonz added this pull request to the merge queue Feb 11, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 11, 2025
@martinvonz martinvonz added this pull request to the merge queue Feb 11, 2025
Merged via the queue into main with commit 61c3be6 Feb 11, 2025
42 checks passed
@martinvonz martinvonz deleted the aseipp/push-vslxsypqtwlv branch February 11, 2025 06:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants