From eeb15da45fa4fad6e3c2bc9b9ace1e12c3d5bfc5 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Thu, 17 Aug 2023 08:34:10 -0400 Subject: [PATCH] Fix #142, Create workflow to automate merging pull requests and pushing them to the integration-candidate branch --- .github/workflows/icbundle.yml | 73 ++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/icbundle.yml diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml new file mode 100644 index 0000000..6ff11fa --- /dev/null +++ b/.github/workflows/icbundle.yml @@ -0,0 +1,73 @@ +name: Integration Candidate Bundle Generation + +# Generate Integration Candidate branch for this repository. + +on: + workflow_dispatch: + inputs: + pr_nums: + description: 'The pull request numbers to include (Comma separated)' + required: true + type: string + +jobs: + generate-ic-bundle: + runs-on: ubuntu-latest + steps: + - name: Install Dependencies + run: | + sudo apt update + sudo apt install -y w3m + - name: Checkout IC Branch + uses: actions/checkout@v3 + with: + fetch-depth: '0' + ref: main + - name: Rebase IC Branch + run: | + git config user.name "GitHub Actions" + git config user.email "cfs-program@list.nasa.gov" + git pull + git checkout integration-candidate + git rebase main + - name: Merge each PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") + for pr in $prs + do + src_branch=$(hub pr show -f %H $pr) + pr_title=$(hub pr show -f %t $pr) + commit_msg=$'Merge pull request #'"${pr}"$' from '"${src_branch}"$'\n\n'"${pr_title}" + git fetch origin pull/$pr/head:origin/pull/$pr/head + git merge origin/pull/$pr/head --no-ff -m "$commit_msg" + done + - name: Update Changelog and Version.h files + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + rev_num=$(git rev-list v2.5.0-rc4.. --count) + changelog_entry=$'# Changelog\\n\\n## Development Build: v2.5.0-rc4+dev'${rev_num} + prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") + see_entry=$'\-\ See:' + for pr in $prs + do + pr_title=$(hub pr show -f %t $pr) + changelog_entry="${changelog_entry}"$'\\n- '"${pr_title@Q}" + see_entry="${see_entry}"$' ' + done + changelog_entry="${changelog_entry}\n${see_entry}\n" + 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|" fsw/src/ci_lab_version.h + - name: Commit and Push Updates to IC Branch + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + rev_num=$(git rev-list v2.5.0-rc4.. --count) + git add CHANGELOG.md + git add fsw/src/ci_lab_version.h + git commit -m "Updating documentation and version numbers for v2.5.0-rc4+dev${rev_num}" + git push -v origin integration-candidate