From 2ea0c177f1d1e33b9deea20671906ce554b7d6d5 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Tue, 8 Aug 2023 11:17:53 -0400 Subject: [PATCH 1/5] Update icbundle.yml test --- .github/workflows/icbundle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index c943edd86..d216a186e 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -48,7 +48,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | rev_num=$(git rev-list v7.0.0-rc4.. --count) - changelog_entry=$'# Changelog\\n\\n## Development Build: v7.0.0-rc4+dev'${rev_num} + changelog_entry=$' Changelog\\n\\n## Development Build: v7.0.0-rc4+dev'${rev_num} prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") see_entry=$'\-\ See:' for pr in $prs @@ -59,9 +59,9 @@ jobs: done changelog_entry="${changelog_entry}\n${see_entry}\n" echo "s|# Changelog|$changelog_entry|" - sed -ir "s|Changelog|$changelog_entry|" CHANGELOG.md + sed -ir "0,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 */' + 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 - name: Commit and Push Updates to IC Branch env: From d2ad5bf88975352edf21e63e51d058faee6d4566 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Tue, 8 Aug 2023 14:03:26 -0400 Subject: [PATCH 2/5] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index d216a186e..f4d4dce97 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -59,7 +59,7 @@ jobs: done changelog_entry="${changelog_entry}\n${see_entry}\n" echo "s|# Changelog|$changelog_entry|" - sed -ir "0,s|Changelog|$changelog_entry|" CHANGELOG.md + awk 'NR==1,/Changelog/{sub(/Changelog/, $changelog_entry)} 1' CHANGELOG.md > 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 From e35105da9ce93adbdcf12e05b7fd0ae6d55305c2 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Tue, 8 Aug 2023 16:21:17 -0400 Subject: [PATCH 3/5] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index f4d4dce97..3dd811cb7 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -58,7 +58,7 @@ jobs: see_entry="${see_entry}"$' ' done changelog_entry="${changelog_entry}\n${see_entry}\n" - echo "s|# Changelog|$changelog_entry|" + echo awk 'NR==1,/Changelog/{sub(/Changelog/, $changelog_entry)} 1' CHANGELOG.md awk 'NR==1,/Changelog/{sub(/Changelog/, $changelog_entry)} 1' CHANGELOG.md > CHANGELOG.md buildnumber_entry=$'define CFE_BUILD_NUMBER '${rev_num}$' /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */' From fbc41e232f5872bf9471e25bb8d13db3b8575caa Mon Sep 17 00:00:00 2001 From: dzbaker Date: Tue, 8 Aug 2023 16:32:14 -0400 Subject: [PATCH 4/5] Update icbundle.yml --- .github/workflows/icbundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 3dd811cb7..1c861009c 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -48,7 +48,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | rev_num=$(git rev-list v7.0.0-rc4.. --count) - changelog_entry=$' Changelog\\n\\n## Development Build: v7.0.0-rc4+dev'${rev_num} + changelog_entry=$'# Changelog\\n\\n## Development Build: v7.0.0-rc4+dev'${rev_num} prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") see_entry=$'\-\ See:' for pr in $prs @@ -59,7 +59,7 @@ jobs: done changelog_entry="${changelog_entry}\n${see_entry}\n" echo awk 'NR==1,/Changelog/{sub(/Changelog/, $changelog_entry)} 1' CHANGELOG.md - awk 'NR==1,/Changelog/{sub(/Changelog/, $changelog_entry)} 1' CHANGELOG.md > 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 From 9dc34e6ad9c7b9be5432ffee42e3b9868d9f3f60 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Tue, 8 Aug 2023 16:37:13 -0400 Subject: [PATCH 5/5] Create test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 000000000..19f0805d8 --- /dev/null +++ b/test @@ -0,0 +1 @@ +qwerty