Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2419, Fixes errors in IC Bundle workflow file #2420

Merged
merged 3 commits into from
Sep 1, 2023
Merged

Fix #2419, Fixes errors in IC Bundle workflow file #2420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9579423
Fix #2419, Fixes errors in IC Bundle workflow file
dzbaker Aug 8, 2023
bcf62c0
Merge branch 'main' into icbundle-fixes
dzbaker Aug 8, 2023
7719743
Merge branch 'main' into icbundle-fixes
dzbaker Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/icbundle.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading