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 #399, Fixes errors in IC Bundle workflow file #400

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Fix #399, Fixes errors in IC Bundle workflow file #400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions .github/workflows/icbundle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Dependencies
run: sudo apt update
run: sudo apt install -y w3m
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"
run: git config user.email "[email protected]"
run: git pull
run: git checkout integration-candidate
run: git rebase main
run: |
git config user.name "GitHub Actions"
git config user.email "[email protected]"
git pull
git checkout integration-candidate
git rebase main
- name: Merge each PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -59,21 +61,21 @@ jobs:
sed -ir "s|# Changelog|$changelog_entry|" CHANGELOG.md

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/mcp750-vxworks/inc/psp_version.h

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-linux/inc/psp_version.h

buildnumber_entry=$'#define CFE_PSP_IMPL_BUILD_NUMBER '${rev_num}
sed -ir "s|define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
sed -ir "s|#define CFE_PSP_IMPL_BUILD_NUMBER.*|$buildnumber_entry|" fsw/pc-rtems/inc/psp_version.h
- name: Commit and Push Updates to IC Branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: git add CHANGELOG.md
run: git add fsw/mcp750-vxworks/inc/psp_version.h
run: git add fsw/pc-linux/inc/psp_version.h
run: git add fsw/pc-rtems/inc/psp_version.h
run: |
rev_num=$(git rev-list v1.6.0-rc4.. --count)
git add CHANGELOG.md
git add fsw/mcp750-vxworks/inc/psp_version.h
git add fsw/pc-linux/inc/psp_version.h
git add fsw/pc-rtems/inc/psp_version.h
git commit -m "Updating documentation and version numbers for v1.6.0-rc4+dev${rev_num}"
run: git push -v origin integration-candidate
git push -v origin integration-candidate
Loading