Skip to content

chore: CI/QA/Build meintenance #358

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

Merged
merged 5 commits into from
Mar 30, 2023
Merged

chore: CI/QA/Build meintenance #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3103c8e
build: streamlined ci and builds
jkowalleck Mar 20, 2023
406f851
chore: upgrade lockfile with poetry1.4
jkowalleck Mar 20, 2023
323be47
removed extra brace
madpah Mar 30, 2023
d4bd129
fixed long line
madpah Mar 30, 2023
1e74da7
Merge branch 'main' into build-maintenance
madpah Mar 30, 2023
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
5 changes: 3 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ concurrency:

env:
PYTHON_VERSION_DEFAULT: "3.11"
POETRY_VERSION: "1.1.12"
POETRY_VERSION: "1.4.1"
PY_SEMVER_RELEASE_VERSION: "7.33.2"

jobs:
release:
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
- name: Python Semantic Release
# see https://python-semantic-release.readthedocs.io/en/latest/automatic-releases/github-actions.html
# see https://github.com/relekang/python-semantic-release
uses: relekang/python-semantic-release@v7.33.2
uses: relekang/python-semantic-release@${{ env.PY_SEMVER_RELEASE_VERSION }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
repository_username: __token__
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/manual-release-candidate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
required: true
type: string

env:
PYTHON_VERSION_DEFAULT: "3.11"
POETRY_VERSION: "1.4.1"
PY_SEMVER_RELEASE_VERSION: "7.33.2"

jobs:
release_candidate:
runs-on: ubuntu-latest
Expand All @@ -19,18 +24,18 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
- name: Install dependencies
run: |
python -m pip install poetry --upgrade pip
python -m pip install poetry=="$POETRY_VERSION" --upgrade pip
poetry config virtualenvs.create false
poetry install
python -m pip install python-semantic-release==7.28.1
python -m pip install python-semantic-release=="$PY_SEMVER_RELEASE_VERSION"
- name: Apply Pre Release Version
run: |
RC_VERSION="$(semantic-release --noop --major print-version)-${{ github.event.inputs.release_candidate_suffix }}"
echo "RC Version will be: ${RC_VERSION}"
poetry version ${RC_VERSION}
poetry version "${RC_VERSION}"
poetry build
- name: Publish Pre Release 📦 to PyPI
uses: pypa/gh-action-pypi-publish@master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/poetry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
env:
REPORTS_DIR: CI_reports
PYTHON_VERSION_DEFAULT: "3.11"
POETRY_VERSION: "1.1.12"
POETRY_VERSION: "1.4.1"

jobs:
coding-standards:
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- "3.10"
- "3.9"
- "3.8"
- "3.7" # lowest supported
- "3.7" # lowest supported
toxenv-factor: ['locked']
include:
- # test with the lowest dependencies
Expand Down
4 changes: 2 additions & 2 deletions cyclonedx/model/bom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ def validate(self) -> bool:
):
warnings.warn(
f'The Component this BOM is describing {self.metadata.component.purl} has no defined dependencies '
f'which means the Dependency Graph is incomplete - you should add direct dependencies to this Component '
f'to complete the Dependency Graph data.',
f'which means the Dependency Graph is incomplete - you should add direct dependencies to this '
f'Component to complete the Dependency Graph data.',
UserWarning
)

Expand Down
Loading