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

Formalize PR process for breaking changes #2289

Merged
merged 15 commits into from
Oct 5, 2023
Merged

Conversation

thomas-bc
Copy link
Collaborator

Originating Project/Creator
Affected Component CI
Affected Architectures(s)
Related Issue(s) #2278
Has Unit Tests (y/n)
Builds Without Errors (y/n)
Unit Tests Pass (y/n)
Documentation Included (y/n)

Change Description

When building external repositories (with reusable-builder.yml) such as our tutorial suite, CI will first check for the existence of the branch pr-<PR_NUMBER> on the external repository. If a branch is found, use it. If not, use devel.

Rationale

This will allow developers to propose changes (and CI to run on those changes) without needing to merge them into devel, which was a source of weirdnesses in the process. Also allows for concurrent PRs to be reviewed, without having to merge one first for the other one to be reviewable.

Comments

This is honestly just a proposal. Everything is interconnected and that makes it hard to come up with a really clean solution. This is the best I could do - let me know if you can think of other ideas.

Future work

Consider dropping the main branch on the tutorial repos, and only use devel like we're doing on core F´ and tools/GDS.

@thomas-bc thomas-bc requested a review from LeStarch September 30, 2023 01:19
@thomas-bc thomas-bc marked this pull request as ready for review October 5, 2023 19:38
@LeStarch LeStarch merged commit 1395f2a into nasa:devel Oct 5, 2023
31 checks passed
LeStarch pushed a commit that referenced this pull request Dec 20, 2023
… XML to topology dictionary (#2419)

Co-authored-by: Jack White <jack.white@redwirespaceeurope.com>
@thomas-bc thomas-bc deleted the issue-2278 branch June 25, 2024 18:00
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.

2 participants