Merge pull request #1507 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev29

Author: dzbaker

.github/workflows/build-osal-documentation.yml

@@ -24,7 +24,7 @@ jobs:
     #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
     needs: check-for-duplicates
     if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
 
     steps:

.github/workflows/standalone-build.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         build-type: [Debug, Release]
-        base-os: [ubuntu-22.04, ubuntu-20.04]
+        base-os: [ubuntu-22.04]
 
     runs-on: ${{ matrix.base-os }}
 

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev117
+- 'Fix nasa/cFS#839, Update Workflows to Ubuntu 22.04'
+- See: <https://github.com/nasa/osal/pull/1506>
+
+
 ## Development Build: equuleus-rc1+dev113
 - 'Fix #1496, Update malloc stub'
 - See: <https://github.com/nasa/osal/pull/1497>

src/os/inc/osapi-version.h

@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     113
+#define OS_BUILD_NUMBER     117
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */