From e00582807087dd05bc380964f7f477b98453fd57 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Wed, 9 Aug 2023 09:14:09 -0400 Subject: [PATCH 1/2] Fix #1402, Fixes errors in IC Bundle workflow file --- .github/workflows/icbundle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index d955a680e..7768a5abb 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -58,11 +58,10 @@ jobs: see_entry="${see_entry}"$' ' 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 }} From 2ae56c87686e0e868c36d11d734843a56620e65e Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Sep 2023 08:14:24 -0400 Subject: [PATCH 2/2] Updating documentation and version numbers for v6.0.0-rc4+dev229 --- CHANGELOG.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a83310066..486dc66c2 100644 --- 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 + ## 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 index e94571378..76314df82 100644 --- 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" /*