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

Fix #2297, Create Workflow for IC Bundle Generation #2298

Merged
merged 1 commit into from
Apr 25, 2023

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Apr 19, 2023

Checklist (Please check before submitting)

Describe the contribution
A clear and concise description of what the contribution is.

Testing performed
Generated IC branch in fork.

Expected behavior changes
Adds new workflow for integration candidate branch generation.

Contributor Info - All information REQUIRED for consideration of pull request
Dylan Z. Baker/NASA GSFC 582

@dzbaker dzbaker linked an issue Apr 19, 2023 that may be closed by this pull request
…pushing them to the integration-candidate branch.
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

Looks OK, but I'd like to discuss the possibility of naming the IC branch using a date-based scheme, e.g.ic-YYYYMMDD instead of always calling it integration-candidate.

Once the testing of the IC is done, the branch is simply deleted (this can be because it was merged to main or something broke and we abandon it).

IMO having unique branch names for each IC makes things more manageable. Is there a reason we need to keep the name the same?

@dzbaker
Copy link
Collaborator Author

dzbaker commented Apr 20, 2023

Looks OK, but I'd like to discuss the possibility of naming the IC branch using a date-based scheme, e.g.ic-YYYYMMDD instead of always calling it integration-candidate.

Once the testing of the IC is done, the branch is simply deleted (this can be because it was merged to main or something broke and we abandon it).

IMO having unique branch names for each IC makes things more manageable. Is there a reason we need to keep the name the same?

I think we should consider using the date scheme. The process that I inherited was to use a single integration-candidate branch, so I want to get team concurrence before I change it.

@dzbaker
Copy link
Collaborator Author

dzbaker commented Apr 20, 2023

CCB 20 April 2023: Configure shell to trigger BASH to exit if something goes wrong in run block. Split run blocks where possible.

@dzbaker dzbaker added CCB:Provisionally-Approved CCB:Approved Indicates code review and approval by community CCB and removed CCB:Provisionally-Approved labels Apr 20, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 25, 2023
*Combines:*

cFE v7.0.0-rc4+dev276
osal v6.0.0-rc4+dev213
PSP v1.6.0-rc4+dev76

**Includes:**

*cFE*
- nasa/cFE#2299
- nasa/cFE#2300
- nasa/cFE#2298

*osal*
- nasa/osal#1383

*PSP*
- nasa/PSP#391

Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
@dzbaker dzbaker mentioned this pull request Apr 25, 2023
2 tasks
@dzbaker dzbaker merged commit a5eaa14 into nasa:main Apr 25, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 25, 2023
*Combines:*

cFE v7.0.0-rc4+dev276
osal v6.0.0-rc4+dev213
PSP v1.6.0-rc4+dev76

**Includes:**

*cFE*
- nasa/cFE#2299
- nasa/cFE#2300
- nasa/cFE#2298

*osal*
- nasa/osal#1383

*PSP*
- nasa/PSP#391

Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB Equuleus-rc1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automate Generation of Integration Candidate Branch
3 participants