mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2026-04-03 04:27:39 -04:00
Remove github_token input, correct for SBOM file placement (#1391)
* Remove github_token input
Inputs need to be literal, static values.
Instead we should simply use `${{ secrets.GITHUB_TOKEN }}`
which is resolved at runtime
* Copy over generated SBOM files
The SBOM generator currently outputs the files
at the workspace root.
This commit is contained in:
parent
e365da1b12
commit
2624889925
1 changed files with 16 additions and 14 deletions
30
.github/workflows/auto-release.yml
vendored
30
.github/workflows/auto-release.yml
vendored
|
|
@ -15,10 +15,6 @@ on:
|
||||||
description: "Version String for task.h on main branch (leave empty to leave as-is)."
|
description: "Version String for task.h on main branch (leave empty to leave as-is)."
|
||||||
required: false
|
required: false
|
||||||
default: ''
|
default: ''
|
||||||
github_token:
|
|
||||||
description: 'GitHub token for creating releases and pushing changes'
|
|
||||||
required: false
|
|
||||||
default: ${{ github.token }}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release-packager:
|
release-packager:
|
||||||
|
|
@ -35,7 +31,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
architecture: x64
|
architecture: x64
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.event.inputs.github_token }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Install GitHub CLI
|
- name: Install GitHub CLI
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -90,7 +86,7 @@ jobs:
|
||||||
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
||||||
MAIN_BR_VERSION_NUMBER: ${{ github.event.inputs.main_br_version }}
|
MAIN_BR_VERSION_NUMBER: ${{ github.event.inputs.main_br_version }}
|
||||||
COMMIT_SHA_1: ${{ env.COMMIT_SHA_1 }}
|
COMMIT_SHA_1: ${{ env.COMMIT_SHA_1 }}
|
||||||
GITHUB_TOKEN: ${{ github.event.inputs.github_token }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
# Install deps and run
|
# Install deps and run
|
||||||
pip install -r ./tools/.github/scripts/release-requirements.txt
|
pip install -r ./tools/.github/scripts/release-requirements.txt
|
||||||
|
|
@ -126,7 +122,7 @@ jobs:
|
||||||
- name: Create pull request
|
- name: Create pull request
|
||||||
env:
|
env:
|
||||||
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
||||||
GH_TOKEN: ${{ github.event.inputs.github_token }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
REPO_FULL_NAME: ${{ github.repository }}
|
REPO_FULL_NAME: ${{ github.repository }}
|
||||||
working-directory: ./local_kernel
|
working-directory: ./local_kernel
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -140,7 +136,7 @@ jobs:
|
||||||
|
|
||||||
- name: Wait for PR to be merged
|
- name: Wait for PR to be merged
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.event.inputs.github_token }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
REPO_FULL_NAME: ${{ github.repository }}
|
REPO_FULL_NAME: ${{ github.repository }}
|
||||||
working-directory: ./local_kernel
|
working-directory: ./local_kernel
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -179,12 +175,18 @@ jobs:
|
||||||
- name: Commit SBOM file
|
- name: Commit SBOM file
|
||||||
env:
|
env:
|
||||||
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
||||||
GITHUB_TOKEN: ${{ github.event.inputs.github_token }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
working-directory: ./local_kernel
|
|
||||||
run: |
|
run: |
|
||||||
|
# SBOM generator writes files to the workspace root — copy them into the repo
|
||||||
|
cp *SPDX* ./local_kernel/ 2>/dev/null || cp *spdx* ./local_kernel/ 2>/dev/null || true
|
||||||
|
cd ./local_kernel
|
||||||
git add .
|
git add .
|
||||||
git commit -m '[AUTO][RELEASE]: Update SBOM'
|
if git diff --cached --quiet; then
|
||||||
git push -u origin "$VERSION_NUMBER"
|
echo "No SBOM changes to commit."
|
||||||
|
else
|
||||||
|
git commit -m '[AUTO][RELEASE]: Update SBOM'
|
||||||
|
git push -u origin "$VERSION_NUMBER"
|
||||||
|
fi
|
||||||
echo "COMMIT_SHA_2=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
echo "COMMIT_SHA_2=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
|
|
@ -193,7 +195,7 @@ jobs:
|
||||||
MAIN_BR_VERSION_NUMBER: ${{ github.event.inputs.main_br_version }}
|
MAIN_BR_VERSION_NUMBER: ${{ github.event.inputs.main_br_version }}
|
||||||
COMMIT_SHA_2: ${{ env.COMMIT_SHA_2 }}
|
COMMIT_SHA_2: ${{ env.COMMIT_SHA_2 }}
|
||||||
REPO_OWNER: ${{ github.repository_owner }}
|
REPO_OWNER: ${{ github.repository_owner }}
|
||||||
GITHUB_TOKEN: ${{ github.event.inputs.github_token }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
# Install deps and run
|
# Install deps and run
|
||||||
pip install -r ./tools/.github/scripts/release-requirements.txt
|
pip install -r ./tools/.github/scripts/release-requirements.txt
|
||||||
|
|
@ -212,7 +214,7 @@ jobs:
|
||||||
if: always()
|
if: always()
|
||||||
env:
|
env:
|
||||||
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
|
||||||
GH_TOKEN: ${{ github.event.inputs.github_token }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
working-directory: ./local_kernel
|
working-directory: ./local_kernel
|
||||||
run: |
|
run: |
|
||||||
# Only delete release-prep branch if the PR was already merged
|
# Only delete release-prep branch if the PR was already merged
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue