Skip to content

Commit

Permalink
Merge pull request #2420 from dzbaker:icbundle-fixes
Browse files Browse the repository at this point in the history
Fix #2419, Fixes errors in IC Bundle workflow file
  • Loading branch information
dzbaker committed Sep 1, 2023
2 parents 11fa058 + 7719743 commit 695d3c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/icbundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
25 changes: 1 addition & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,30 +123,7 @@
- See <https://github.com/nasa/cFE/pull/2184>

## Development Build: v7.0.0-rc4+dev197
- Remove # Changelog

## Development Build: v7.0.0-rc4+dev366
- 'Fix #2427, Race condition in TestCreateChild'
- See: <https://github.com/nasa/cFE/pull/2428>


## Development Build: v7.0.0-rc4+dev362
- 'Fix #2421, adjust dependencies on table lib'
- 'Fix #2423, avoid use of abspath make function'
- See: <https://github.com/nasa/cFE/pull/2422> <https://github.com/nasa/cFE/pull/2424>


## Development Build: v7.0.0-rc4+dev356
- 'Fix #2415, use correct object extension in table build'
- See: <https://github.com/nasa/cFE/pull/2416>


## 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
- Remove Changelog in Doxygen Config
- See <https://github.com/nasa/cFE/pull/2165>

## Development Build: v7.0.0-rc4+dev193
Expand Down

0 comments on commit 695d3c9

Please sign in to comment.