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

PSP Integration candidate: Equuleus-rc1+dev12 #431

Merged
merged 3 commits into from
May 21, 2024
Merged

PSP Integration candidate: Equuleus-rc1+dev12 #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
902b251
Fix #429, Adds node20 compatible github actions
Mar 21, 2024
14e44dd
Merge pull request #430 from chillfig:node20
dzbaker May 6, 2024
f85abab
Updating documentation and version numbers for equuleus-rc1+dev42
dzbaker May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/icbundle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
sudo apt update
sudo apt install -y w3m
- name: Checkout IC Branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: '0'
ref: main
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: equuleus-rc1+dev42
- Adds node20 compatible github actions
- See <https://github.com/nasa/PSP/pull/430>

## Development Build: equuleus-rc1+dev38
- updating PSP to use new versioning system
- conditional module inclusion
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#define CFE_PSP_IMPL_BUILD_NUMBER 42
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#define CFE_PSP_IMPL_BUILD_NUMBER 42
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 38
#define CFE_PSP_IMPL_BUILD_NUMBER 42
#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
#define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
Loading