Merge pull request #431 from nasa/integration-candidate

PSP Integration candidate: Equuleus-rc1+dev12
nasa · May 21, 2024 · f592144 · f592144
2 parents 70be39d + f85abab
commit f592144
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git 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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git 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
@@ -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
@@ -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 */