From a8818520ae969748c427ce0c01e6ed08709e58c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:22:18 +0100
Subject: [PATCH 1/6] workflow dispatch and cron for both dev and master

---
 .github/workflows/trivy.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index b1014c8e6..645d4714d 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -5,9 +5,17 @@
 # ---------------------------------
 name: trivy
 on:
+  workflow_dispatch:
+    branches:
+      - master
+      - dev
   schedule:
     # - cron: "*/5 * * * *"
-    - cron: "0 7,13 * * *"
+    cron: "0 7,13 * * *"
+    branches:
+      - master
+      - dev
+
 jobs:
   scan:
     permissions:

From 3dad6e4d76ce56104f22c4a75d0f65a188191380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:31:31 +0100
Subject: [PATCH 2/6] changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 719e5bcda..b15ac8f0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -197,5 +197,6 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe
 - Bug: Fix type issue in 0c9c237cced5 (latest) migration ([#1360](https://github.com/ScilifelabDataCentre/dds_web/pull/1360))
 - 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))
-- Workflox: Add option to publish dev image manually ([#1376](https://github.com/ScilifelabDataCentre/dds_web/pull/1376))
+- Workflow: Add option to publish dev image manually ([#1376](https://github.com/ScilifelabDataCentre/dds_web/pull/1376))
 - 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))

From 9442402f981c6c7398c0630b84d40b7364d66145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:48:41 +0100
Subject: [PATCH 3/6] indent

---
 .github/workflows/trivy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 645d4714d..0570c1988 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -11,10 +11,10 @@ on:
       - dev
   schedule:
     # - cron: "*/5 * * * *"
-    cron: "0 7,13 * * *"
-    branches:
-      - master
-      - dev
+    - cron: "0 7,13 * * *"
+      branches:
+        - master
+        - dev
 
 jobs:
   scan:

From 87f91719c76454d726b7873c9be3c59d23a69186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:58:12 +0100
Subject: [PATCH 4/6] scheduled only run on default branch

---
 .github/workflows/trivy.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 0570c1988..70f8f25b8 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -12,10 +12,6 @@ on:
   schedule:
     # - cron: "*/5 * * * *"
     - cron: "0 7,13 * * *"
-      branches:
-        - master
-        - dev
-
 jobs:
   scan:
     permissions:

From 2b659b731b8c6bc0cd741870154455970509aaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:07:47 +0100
Subject: [PATCH 5/6] change yml file e.g. name

---
 .github/workflows/python-black.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/python-black.yml b/.github/workflows/python-black.yml
index 74127ef6f..a3a7d09c1 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

From 476c6d42353121692d1e3a6d2fd698c958d24e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?=
 <i-oden@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:09:45 +0100
Subject: [PATCH 6/6] syntax error

---
 .github/workflows/python-black.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-black.yml b/.github/workflows/python-black.yml
index a3a7d09c1..7bdf6d299 100644
--- a/.github/workflows/python-black.yml
+++ b/.github/workflows/python-black.yml
@@ -12,4 +12,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        uses: psf/black@stable
+      - uses: psf/black@stable