Skip to content

Reduce git conflicts and verbose test definitions.#574

Draft
ximon18 wants to merge 3 commits into
mainfrom
simplify-system-test-list
Draft

Reduce git conflicts and verbose test definitions.#574
ximon18 wants to merge 3 commits into
mainfrom
simplify-system-test-list

Conversation

@ximon18
Copy link
Copy Markdown
Member

@ximon18 ximon18 commented Apr 10, 2026

Combine the almost identical system test definitions into a single job that invokes them as a matrix requiring only that new test names be added to the 'tests' matrix key rather than duplicating the entire job block every time, and each PR that adds a system test then conflicting with the others due to each modifying the same part of system-tests.yml.

Notes added to act-wrapper help output:

  • To limit which tests are run by the new tests job one must now supply --matrix tests: instead of --job ..
  • To limit the number of concurrent 'tests' sub-jobs one must now supply --input concurrent-tests:1

The tests fail when run, not sure if that also happens on main at present.


  • If you are changing Rust code or integration tests (Cargo.*, crates/, etc/, integration-tests/, src/):
    • Did you run the integration tests with act through the act-wrapper (as described in TESTING.md)?

ximon18 added 3 commits April 10, 2026 13:06
Combine the almost identical system test definitions into a single job
that invokes them as a matrix requiring only that new test names be
added to the 'tests' matrix key rather than duplicating the entire job
block every time, and each PR that adds a system test then conflicting
with the others due to each modifying the same part of system-tests.yml.

Adds a note in act-wrapper that to limit which tests are run by the new
tests job one must now supply --matrix tests:<TEST NAME TO RUN> instead
of --job <JOB NAME TO RUN>..
@mozzieongit
Copy link
Copy Markdown
Member

and each PR that adds a system test then conflicting with the others due to each modifying the same part of system-tests.yml.

That will still be the case. Now, conflicting in modifying the same matrix definition. There is no way to avoid that conflict other than not all adding to the bottom, but some adding in between other tests (which requires them to be their own blocks instead of a matrix value).

@ximon18
Copy link
Copy Markdown
Member Author

ximon18 commented Apr 10, 2026

True but it's much less irritating to resolve.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants