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 #399, Fixes errors in IC Bundle workflow file #400

Merged
merged 1 commit into from
Sep 1, 2023

Conversation

dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Aug 9, 2023

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

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 <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Jacob Killelea <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
@dzbaker dzbaker mentioned this pull request Sep 1, 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 <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Jacob Killelea <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
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 <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Jacob Killelea <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
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 <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Jacob Killelea <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
@dzbaker dzbaker merged commit 7aa3a67 into nasa:main Sep 1, 2023
11 checks passed
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 <[email protected]>
Co-authored by: Jacob Hageman  <[email protected]>
Co-authored by: Joseph Hickey <[email protected]>
Co-authored by: Jacob Killelea <[email protected]>
Co-authored by: Dylan Z. Baker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant