Skip to content

Commit

Permalink
Merge pull request nasa#2603 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
cFE Integration candidate: Equuleus-rc1+dev18
  • Loading branch information
dzbaker authored Sep 19, 2024
2 parents 7f36a04 + f9de14d commit 561ff53
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4.1.7

- name: Display structure of downloaded files
run: ls -R
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: equuleus-rc1+dev199
- Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
- See <https://github.com/nasa/cFE/pull/2599>

## Development Build: equuleus-rc1+dev195
- Use string append and add newline
- Yield cpu to other tasks in SB Perf Test
Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define CFE_VERSION_H

/* Development Build Macro Definitions */
#define CFE_BUILD_NUMBER 195 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
#define CFE_BUILD_NUMBER 199 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
#define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
#define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down

0 comments on commit 561ff53

Please sign in to comment.