From 902b25133b25d5d7e09ae819a889f06ba3a74a32 Mon Sep 17 00:00:00 2001 From: jdfiguer Date: Thu, 21 Mar 2024 15:49:44 -0400 Subject: [PATCH 1/2] Fix #429, Adds node20 compatible github actions --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index c73ab144..e4501110 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -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 From f85abab5674268789e9a49a39f6a9de1ef2be922 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 6 May 2024 09:30:27 -0400 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev42 --- CHANGELOG.md | 4 ++++ fsw/mcp750-vxworks/inc/psp_version.h | 2 +- fsw/pc-linux/inc/psp_version.h | 2 +- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ffcc498..9bd7a0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev42 +- Adds node20 compatible github actions +- See + ## Development Build: equuleus-rc1+dev38 - updating PSP to use new versioning system - conditional module inclusion diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index a7f9e50a..9c74268a 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -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 */ diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index a7f9e50a..9c74268a 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -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 */ diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index a7f9e50a..9c74268a 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -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 */