diff --git a/.github/workflows/python-black.yml b/.github/workflows/python-black.yml index 74127ef6f..7bdf6d299 100644 --- a/.github/workflows/python-black.yml +++ b/.github/workflows/python-black.yml @@ -3,20 +3,13 @@ # https://github.com/psf/black # This does not format the code, this only detects and informs on issues. # To format with black, run `black .` locally in the repository. -name: Lint Python -on: - push: - paths: - - "**.py" - pull_request: - paths: - - "**.py" +name: Black - Lint Python + +on: [push, pull_request] jobs: - PythonLint: + lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - - name: Check code lints with Black - uses: psf/black@stable + - uses: psf/black@stable diff --git a/.github/workflows/trivy-scheduled.yml b/.github/workflows/trivy-scheduled.yml index 0f5798141..a77abdab5 100644 --- a/.github/workflows/trivy-scheduled.yml +++ b/.github/workflows/trivy-scheduled.yml @@ -5,6 +5,10 @@ # --------------------------------- name: Trivy - ghcr image scan on: + workflow_dispatch: + branches: + - master + - dev schedule: # - cron: "*/5 * * * *" - cron: "0 7,13 * * *" diff --git a/CHANGELOG.md b/CHANGELOG.md index c968a9aec..e6abedd52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -198,5 +198,6 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe - Database: New `Reporting` table for saving unit / user stats every month ([#1363](https://github.com/ScilifelabDataCentre/dds_web/pull/1363)) - Version bump: 2.2.6 ([#1375](https://github.com/ScilifelabDataCentre/dds_web/pull/1375)) - Workflow: Add option to publish dev image manually ([#1376](https://github.com/ScilifelabDataCentre/dds_web/pull/1376)) -- Workflow: Scan branch with trivy ([#1377](https://github.com/ScilifelabDataCentre/dds_web/pull/1377)) - Bug: Add value to `Unit.warning_level` for existing units ([#1378](https://github.com/ScilifelabDataCentre/dds_web/pull/1379)) +- Workflow: Add option to run trivy on dev and master branches manually ([#1380](https://github.com/ScilifelabDataCentre/dds_web/pull/1380)) +- Workflow: Scan branch with trivy ([#1377](https://github.com/ScilifelabDataCentre/dds_web/pull/1377))