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.

Sign up for GitHub

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

Jump to bottom

Fix #206, updating sample_app to use new versioning system. #226

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Fix #206, updating sample_app to use new versioning system. #226

merged 1 commit into from
Jan 18, 2024

Conversation

dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Dec 26, 2023

Describe the contribution
Fixes #206.

Testing performed
Workflows were run.

Expected behavior changes
No behavior changes, however the following changes were made to the versioning system:

  1. Build Baseline is set to "equuleus-rc1"
  2. Mission Revision is set to to 00
  3. "SAMPLE_APP_BUILD_DEV_CYCLE" macro has been defined
  4. Version String has been removed, and all references to it replaced with the Build Baseline/Codename

System(s) tested on
Ubuntu 20.04

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

@dzbaker dzbaker force-pushed the fix-206 branch 2 times, most recently from 9887a7a to 1cb848e Compare December 26, 2023 17:17
dzbaker
dzbaker commented Jan 11, 2024
View reviewed changes
fsw/src/sample_app_version.h Outdated
@@ -38,14 +40,19 @@
#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief Minor version number. */
#define SAMPLE_APP_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

REVISION should be 0 instead of MISSION_REV being 00. Can use to set version string to development vs release.

@dzbaker dzbaker added CCB:Approved Indicates code approval by CCB and removed CCB:Provisionally-Approved labels Jan 17, 2024
@dzbaker dzbaker mentioned this pull request Jan 17, 2024
Merged
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 17, 2024
@dzbaker
IC: equuleus-rc1+dev1
5d8157d 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Jan 17, 2024
Merged
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
4baba1a 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
8185e35 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
9e53413 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
cca7efc 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
4274463 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
@dzbaker dzbaker merged commit 21ff73e into nasa:main Jan 18, 2024
7 of 9 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
@dzbaker
IC: equuleus-rc1+dev1
845cb41 
*Combines:*

sample_app equuleus-rc1+dev36
sch_lab equuleus-rc1+dev29
to_lab equuleus-rc1+dev38
sample_lib equuleus-rc1+dev2
tblCRCTool equuleus-rc1+dev2
cFS-GroundSystem equuleus-rc1+dev2
elf2cfetbl equuleus-rc1+dev10
cFE equuleus-rc1+dev75
PSP equuleus-rc1+dev38
osal equuleus-rc1+dev33

**Includes:**

*sample_app*
- nasa/sample_app#226

*sch_lab*
- nasa/sch_lab#161

*to_lab*
- nasa/sch_lab#186

*sample_lib*
- nasa/sample_lib#96

*tblCRCTool*
- nasa/tblCRCTool#80

*cFS-GroundSystem*
- nasa/cFS-GroundSystem#239

*elf2cfetbl*
- nasa/elf2cfetbl#144
- nasa/elf2cfetbl#143

*cFE*
- nasa/cFE#2463
- nasa/cFE#2486
- nasa/cFE#2485
- nasa/cFE#2489

*PSP*
- nasa/PSP#422
- nasa/PSP#427

*osal*
- nasa/osal#1437
- nasa/osal#1442

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Baker <dzbaker@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CCB:Approved Indicates code approval by CCB
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Versioning System
1 participant
@dzbaker