Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 21 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,28 @@ jobs:
id-token: write
contents: write
steps:
- name: Generate GitHub App Token
id: release-bot-token
# see https://github.com/actions/create-github-app-token
uses: actions/create-github-app-token@v3
with:
# see https://github.com/organizations/CycloneDX/settings/apps/cyclonedx-internal-release-bot
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: update to final link

app-id: 3335294
private-key: ${{ secrets.CDX_RELEASE_BOT_PRIVATE_KEY }}
- name: Get GitHub App User ID
id: release-bot-user-id
run: |
set -xeu
echo "user-id=$(gh api "/users/${{ steps.release-bot-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
env:
GH_TOKEN: ${{ steps.release-bot-token.outputs.token }}

- name: Checkout code
# see https://github.com/actions/checkout
uses: actions/checkout@v6
with:
fetch-depth: 0
token: ${{ steps.release-bot-token.outputs.token }}

- name: Setup python
# see https://github.com/actions/setup-python
Expand All @@ -134,7 +151,9 @@ jobs:
# see https://github.com/python-semantic-release/python-semantic-release
uses: python-semantic-release/python-semantic-release@v10.0.2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
git_committer_name: ${{ steps.release-bot-token.outputs.app-slug }}[bot]
git_committer_email: ${{ steps.release-bot-user-id.outputs.user-id }}+${{ steps.release-bot-token.outputs.app-slug }}[bot]@users.noreply.github.com
github_token: ${{ steps.release-bot-token.outputs.token }}
force: ${{ github.event.inputs.release_force }}
prerelease: ${{ github.event.inputs.prerelease }}
prerelease_token: ${{ github.event.inputs.prerelease_token }}
Expand All @@ -151,5 +170,5 @@ jobs:
# see https://python-semantic-release.readthedocs.io/en/latest/automatic-releases/github-actions.html#python-semantic-release-publish-action
uses: python-semantic-release/publish-action@v10
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ steps.release-bot-token.outputs.token }}
tag: ${{ steps.release.outputs.tag }}
2 changes: 1 addition & 1 deletion cyclonedx/__init__.py
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Rollback

Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

# !! version is managed by semantic_release
# do not use typing here, or else `semantic_release` might have issues finding the variable
__version__ = "11.7.0" # noqa:Q000
__version__ = "11.7.0-rc.4" # noqa:Q000
2 changes: 1 addition & 1 deletion docs/conf.py
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Rollback

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# The full version, including alpha/beta/rc tags
# !! version is managed by semantic_release
release = '11.7.0'
release = '11.7.0-rc.4'

# -- General configuration ---------------------------------------------------

Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
[tool.poetry]
name = "cyclonedx-python-lib"
# !! version is managed by semantic_release
version = "11.7.0"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Rollback

version = "11.7.0-rc.4"
description = "Python library for CycloneDX"
authors = [
"Paul Horton <phorton@sonatype.com>",
Expand Down Expand Up @@ -115,8 +115,7 @@ jsonschema = { version = "*", extras = ["format"], optional=true }
logging_use_named_masks = true
commit_parser = "conventional"
commit_parser_options = { parse_squash_commits = true, ignore_merge_commits = true }
commit_author = "semantic-release <semantic-release@bot.local>"
commit_message = "chore(release): {version}\n\nAutomatically generated by python-semantic-release\n\nSigned-off-by: semantic-release <semantic-release@bot.local>"
commit_message = "chore(release): {version}\n\nAutomatically generated by python-semantic-release"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: add feature to semanti-release to add signoff

upload_to_vcs_release = true
build_command = """
pip install poetry
Expand Down
Loading