Skip to content

Commit

Permalink
Fix various small findings (#91)
Browse files Browse the repository at this point in the history
* Fix edge case of empty ignore list
* Update templates
* Update change log
  • Loading branch information
Nicoretti authored Oct 27, 2023
1 parent 8b07c12 commit c88db83
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/actions/security-issues/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
- name: Install Python Toolbox / Security tool
shell: bash
run: |
pip install exasol-toolbox==0.6.0
pip install exasol-toolbox==0.6.1
- name: Create Security Issue Report
shell: bash
Expand Down Expand Up @@ -62,4 +62,4 @@ runs:
echo -e "## Created Security Issue\n" >> $GITHUB_STEP_SUMMARY
cat created.txt >> $GITHUB_STEP_SUMMARY
echo -e "## Filtered Security Issue\n" >> $GITHUB_STEP_SUMMARY
tail -n +2 filtered.txt | grep . >> $GITHUB_STEP_SUMMARY
tail -n +2 filtered.txt | grep . || true >> $GITHUB_STEP_SUMMARY
10 changes: 10 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@
Unreleased
==========

.. _changelog-0.6.1:

0.6.1 - 2023-10-27
==================

🐞 Fixed
--------

* Fixed failing security-issues action in case of empty ignore list

.. _changelog-0.6.0:

0.6.0 - 2023-10-27
Expand Down
2 changes: 1 addition & 1 deletion doc/github_actions/security_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Example Usage
uses: actions/checkout@v4
- name: Report Security Issues
uses: exasol/python-toolbox/.github/actions/security-issues@0.6.0/security-issues-action
uses: exasol/python-toolbox/.github/actions/security-issues@0.6.1
with:
format: "maven"
command: "cat maven-cve-report.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Build Artifacts
run: poetry build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Check Tag Version
# make sure the pushed/created tag matched the project version
Expand Down
10 changes: 5 additions & 5 deletions exasol/toolbox/templates/github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Check Version(s)
run: poetry run version-check exasol/toolbox/version.py
Expand All @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Build Documentation
run: |
Expand All @@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -71,7 +71,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -93,7 +93,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1
with:
python-version: ${{ matrix.python-version }}

Expand Down
8 changes: 4 additions & 4 deletions exasol/toolbox/templates/github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:

check-tag-version-job:
name: Check Release Tag
uses: exasol/python-toolbox/.github/workflows/check-release-tag.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/check-release-tag.yml@0.6.1

ci-job:
name: Checks
needs: [ check-tag-version-job ]
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.6.1

cd-job:
name: Continues Delivery
needs: [ ci-job ]
uses: exasol/python-toolbox/.github/workflows/build-and-publish.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/build-and-publish.yml@0.6.1
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

metrics:
needs: [ ci-job ]
uses: exasol/python-toolbox/.github/workflows/report.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/report.yml@0.6.1
4 changes: 2 additions & 2 deletions exasol/toolbox/templates/github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:

ci-job:
name: Checks
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.6.1

metrics:
needs: [ ci-job ]
uses: exasol/python-toolbox/.github/workflows/report.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/report.yml@0.6.1
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@v3

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Build Documentation
run: |
Expand Down
6 changes: 3 additions & 3 deletions exasol/toolbox/templates/github/workflows/pr-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

ci-job:
name: Checks
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/checks.yml@0.6.1

publish-docs:
name: Publish Documentation
uses: exasol/python-toolbox/.github/workflows/gh-pages.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/gh-pages.yml@0.6.1

metrics:
needs: [ ci-job ]
uses: exasol/python-toolbox/.github/workflows/report.yml@0.5.0
uses: exasol/python-toolbox/.github/workflows/report.yml@0.6.1
2 changes: 1 addition & 1 deletion exasol/toolbox/templates/github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fetch-depth: 0

- name: Setup Python & Poetry Environment
uses: exasol/python-toolbox/.github/actions/python-environment@0.5.0
uses: exasol/python-toolbox/.github/actions/python-environment@0.6.1

- name: Download Artifacts
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion exasol/toolbox/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# If you need to change the version, do so in the project.toml, e.g. by using `poetry version X.Y.Z`.
MAJOR = 0
MINOR = 6
PATCH = 0
PATCH = 1
VERSION = f"{MAJOR}.{MINOR}.{PATCH}"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "exasol-toolbox"
packages = [
{ include = "exasol" },
]
version = "0.6.0"
version = "0.6.1"
description = ""
authors = [
"Nicola Coretti <nicola.coretti@exasol.com>"
Expand Down

0 comments on commit c88db83

Please sign in to comment.