-
Notifications
You must be signed in to change notification settings - Fork 57
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 #399, Fixes errors in IC Bundle workflow file #400
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dzbaker
added
CCB:Approved
Indicates Approval by CCB
continuous-integration
Equuleus-rc2
labels
Aug 17, 2023
2 tasks
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2023
*Combines:* cFE v7.0.0-rc4+dev384 psp v1.6.0-rc4+dev90 osal v6.0.0-rc4+dev229 elf2cfetbl v3.3.0-rc4+dev36 ci_lab v2.5.0-rc4+dev47 **Includes:** *cFE* - nasa/cFE#2401 - nasa/cFE#2403 - nasa/cFE#2380 - nasa/cFE#2400 - nasa/cFE#2420 *psp* - nasa/PSP#395 - nasa/PSP#400 *osal* - nasa/osal#1409 *elf2cfetbl* - nasa/elf2cfetbl#137 - nasa/elf2cfetbl#136 *ci_lab* - nasa/ci_lab#143 Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com> Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2023
*Combines:* cFE v7.0.0-rc4+dev384 psp v1.6.0-rc4+dev90 osal v6.0.0-rc4+dev229 elf2cfetbl v3.3.0-rc4+dev36 ci_lab v2.5.0-rc4+dev47 **Includes:** *cFE* - nasa/cFE#2401 - nasa/cFE#2403 - nasa/cFE#2380 - nasa/cFE#2400 - nasa/cFE#2420 *psp* - nasa/PSP#395 - nasa/PSP#400 *osal* - nasa/osal#1409 *elf2cfetbl* - nasa/elf2cfetbl#137 - nasa/elf2cfetbl#136 *ci_lab* - nasa/ci_lab#143 Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com> Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2023
*Combines:* cFE v7.0.0-rc4+dev384 psp v1.6.0-rc4+dev90 osal v6.0.0-rc4+dev229 elf2cfetbl v3.3.0-rc4+dev36 ci_lab v2.5.0-rc4+dev47 **Includes:** *cFE* - nasa/cFE#2401 - nasa/cFE#2403 - nasa/cFE#2380 - nasa/cFE#2400 - nasa/cFE#2420 *psp* - nasa/PSP#395 - nasa/PSP#400 *osal* - nasa/osal#1409 *elf2cfetbl* - nasa/elf2cfetbl#137 - nasa/elf2cfetbl#136 *ci_lab* - nasa/ci_lab#143 Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com> Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2023
*Combines:* cFE v7.0.0-rc4+dev384 psp v1.6.0-rc4+dev90 osal v6.0.0-rc4+dev229 elf2cfetbl v3.3.0-rc4+dev36 ci_lab v2.5.0-rc4+dev47 **Includes:** *cFE* - nasa/cFE#2401 - nasa/cFE#2403 - nasa/cFE#2380 - nasa/cFE#2400 - nasa/cFE#2420 *psp* - nasa/PSP#395 - nasa/PSP#400 *osal* - nasa/osal#1409 *elf2cfetbl* - nasa/elf2cfetbl#137 - nasa/elf2cfetbl#136 *ci_lab* - nasa/ci_lab#143 Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com> Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2023
*Combines:* cFE v7.0.0-rc4+dev384 psp v1.6.0-rc4+dev90 osal v6.0.0-rc4+dev229 elf2cfetbl v3.3.0-rc4+dev36 ci_lab v2.5.0-rc4+dev47 **Includes:** *cFE* - nasa/cFE#2401 - nasa/cFE#2403 - nasa/cFE#2380 - nasa/cFE#2400 - nasa/cFE#2420 *psp* - nasa/PSP#395 - nasa/PSP#400 *osal* - nasa/osal#1409 *elf2cfetbl* - nasa/elf2cfetbl#137 - nasa/elf2cfetbl#136 *ci_lab* - nasa/ci_lab#143 Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com> Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Addresses issue #399.
Testing performed
Generated IC branch in fork.
Expected behavior changes
No additional "#" is placed in front of "#define CFE_PSP_IMPL_BUILD_NUMBER ..." in fsw/mcp750-vxworks/inc/psp_version.h
No additional "#" is placed in front of "#define CFE_PSP_IMPL_BUILD_NUMBER ..." in fsw/pc-linux/inc/psp_version.h
No additional "#" is placed in front of "#define CFE_PSP_IMPL_BUILD_NUMBER ..." in fsw/pc-rtems/inc/psp_version.h
System(s) tested on
GitHub
Contributor Info - All information REQUIRED for consideration of pull request
Dylan Z. Baker/NASA GSFC