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 #145, updating ci_lab to use new versioning system. #171

Merged
merged 6 commits into from
Jan 18, 2024

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Dec 26, 2023

Describe the contribution
Fixes #145.

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. "CI_LAB_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-145 branch 5 times, most recently from af70d21 to b9f7a64 Compare December 26, 2023 15:54
@@ -36,14 +38,19 @@
#define CI_LAB_MINOR_VERSION 3 /*!< @brief Minor version number */
#define CI_LAB_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
Copy link
Collaborator 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 force-pushed the fix-145 branch 2 times, most recently from 6ceb28c to 2b0c488 Compare January 17, 2024 18:20
dzbaker added a commit that referenced this pull request Jan 18, 2024
Fix #145, updating ci_lab to use new versioning system.
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
*Combines:*

ci_lab equuleus-rc1+dev51
cFE equuleus-rc1+dev79
osal equuleus-rc1+dev37

**Includes:**

*ci_lab*
- nasa/ci_lab#162
- nasa/ci_lab#171

*cFE*
- nasa/cFE#2494

*osal*
- nasa/osal#1436

Co-authored by: Jacob Hageman <[email protected]>
Co-authored by: Andrew Hatstat <[email protected]>
Co-authored by: Dylan Baker <[email protected]>
@dzbaker dzbaker mentioned this pull request Jan 18, 2024
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
*Combines:*

ci_lab equuleus-rc1+dev51
cFE equuleus-rc1+dev79
osal equuleus-rc1+dev37

**Includes:**

*ci_lab*
- nasa/ci_lab#162
- nasa/ci_lab#171

*cFE*
- nasa/cFE#2494

*osal*
- nasa/osal#1436

Co-authored by: Jacob Hageman <[email protected]>
Co-authored by: Andrew Hatstat <[email protected]>
Co-authored by: Dylan Baker <[email protected]>
@dzbaker dzbaker merged commit 44c28d3 into nasa:main Jan 18, 2024
15 of 19 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Jan 18, 2024
*Combines:*

ci_lab equuleus-rc1+dev51
cFE equuleus-rc1+dev79
osal equuleus-rc1+dev37

**Includes:**

*ci_lab*
- nasa/ci_lab#162
- nasa/ci_lab#171

*cFE*
- nasa/cFE#2494

*osal*
- nasa/osal#1436

Co-authored by: Jacob Hageman <[email protected]>
Co-authored by: Andrew Hatstat <[email protected]>
Co-authored by: Dylan Baker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Versioning System
1 participant