Skip to content

Commit d436801

Browse files
Generates SBOM after source files are updated with release tag (#680)
* update source file with release version info before SBOM generation * delete tag branch during cleanup
1 parent 953c1ee commit d436801

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

.github/workflows/auto-release.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
- name: Tool Setup
2626
uses: actions/setup-python@v2
2727
with:
28-
python-version: 3.7.10
2928
architecture: x64
3029
env:
3130
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -51,7 +50,18 @@ jobs:
5150
5251
- name: create a new branch that references commit id
5352
working-directory: ./local_kernel
54-
run: git checkout -b ${{ github.event.inputs.version_number }} ${{ github.event.inputs.commit_id }}
53+
run: |
54+
git checkout -b ${{ github.event.inputs.version_number }} ${{ github.event.inputs.commit_id }}
55+
echo "COMMIT_SHA_1=$(git rev-parse HEAD)" >> $GITHUB_ENV
56+
57+
- name: Update source files with version info
58+
run: |
59+
# Install deps and run
60+
pip install -r ./tools/.github/scripts/release-requirements.txt
61+
./tools/.github/scripts/update_src_version.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ env.COMMIT_SHA_1 }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
62+
exit $?
63+
env:
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5565

5666
- name: Generate SBOM
5767
uses: FreeRTOS/CI-CD-Github-Actions/sbom-generator@main
@@ -65,13 +75,19 @@ jobs:
6575
git add .
6676
git commit -m 'Update SBOM'
6777
git push -u origin ${{ github.event.inputs.version_number }}
68-
echo "COMMIT_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
78+
echo "COMMIT_SHA_2=$(git rev-parse HEAD)" >> $GITHUB_ENV
6979
7080
- name: Release
7181
run: |
7282
# Install deps and run
7383
pip install -r ./tools/.github/scripts/release-requirements.txt
74-
./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ env.COMMIT_SHA }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
84+
./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ env.COMMIT_SHA_2 }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
7585
exit $?
7686
env:
7787
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
88+
89+
- name: Cleanup
90+
working-directory: ./local_kernel
91+
run: |
92+
# Delete the branch created for Tag by SBOM generator
93+
git push -u origin --delete ${{ github.event.inputs.version_number }}

0 commit comments

Comments
 (0)