Merge pull request #1409 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev57
nasa · Sep 1, 2023 · dc548b7 · dc548b7
2 parents 99e3b40 + 2ae56c8
commit dc548b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml
@@ -58,11 +58,10 @@ jobs:
             see_entry="${see_entry}"$' <https://github.com/nasa/cFE/pull/'${pr}$'>'
           done
           changelog_entry="${changelog_entry}\n${see_entry}\n"
-          echo "s|# Changelog|$changelog_entry|"
-          sed -ir "s|Changelog|$changelog_entry|" CHANGELOG.md
+          sed -ir "s|# Changelog|$changelog_entry|" CHANGELOG.md
           
           buildnumber_entry=$'#define OS_BUILD_NUMBER   '${rev_num}
-          sed -ir "s|define OS_BUILD_NUMBER.*|$buildnumber_entry|" src/os/inc/osapi-version.h
+          sed -ir "s|#define OS_BUILD_NUMBER.*|$buildnumber_entry|" src/os/inc/osapi-version.h
       - name: Commit and Push Updates to IC Branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v6.0.0-4c4+dev229
+- Fixes errors in IC Bundle workflow file
+- See <https://github.com/nasa/osal/pull/1403>
+
 ## Development Build: v6.0.0-rc4+dev223
 - 'Fix #1396, do not use intmax_t/uintmax_t types'
 - 'Fix #1398, separate bind and listen calls for streams'

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   223
+#define OS_BUILD_NUMBER   229
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*