From 9579423ed8c7f3a471d090d73dcf3b5bef3d2c3f Mon Sep 17 00:00:00 2001
From: dzbaker <dylan.z.baker@nasa.gov>
Date: Tue, 8 Aug 2023 11:15:15 -0400
Subject: [PATCH] Fix #2419, Fixes errors in IC Bundle workflow file
---
.github/workflows/icbundle.yml | 5 ++---
CHANGELOG.md | 10 +---------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml
index c943edd86..460cff552 100644
--- 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 CFE_BUILD_NUMBER '${rev_num}$' /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */'
- sed -ir "s|define CFE_BUILD_NUMBER.*|$buildnumber_entry|" modules/core_api/fsw/inc/cfe_version.h
+ sed -ir "s|#define CFE_BUILD_NUMBER.*|$buildnumber_entry|" modules/core_api/fsw/inc/cfe_version.h
- name: Commit and Push Updates to IC Branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 712ec25fe..e164788c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,15 +102,7 @@
- See <https://github.com/nasa/cFE/pull/2184>
## Development Build: v7.0.0-rc4+dev197
-- Remove # Changelog
-
-## Development Build: v7.0.0-rc4+dev342
-- 'Fix #2368, cFE Functional Test 23'
-- 'Fix #1407, Add error report on EVS failure during log header write'
-- 'Fix #1515, Remove unnecessary memset from CFE_TBL_LoadFromFile'
-- See: <https://github.com/nasa/cFE/pull/2369> <https://github.com/nasa/cFE/pull/2272> <https://github.com/nasa/cFE/pull/2276>
- in Doxygen Config
-- See <https://github.com/nasa/cFE/pull/2165>
+- Remove Changelog in Doxygen Config
## Development Build: v7.0.0-rc4+dev193
- Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines.