From 42e9edc9db65c5a2c5bf269fda3fd2ca8785cd1e Mon Sep 17 00:00:00 2001
From: Govert Brinkmann <gbrinkmann@beeldengeluid.nl>
Date: Wed, 2 Oct 2024 16:00:44 +0200
Subject: [PATCH 1/3] Merge workflows

---
 .github/workflows/build-push-image.yml       |  1 +
 .github/workflows/manual-build-push-ghcr.yml | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 .github/workflows/manual-build-push-ghcr.yml

diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
index c9fc0f3..c85ffac 100644
--- a/.github/workflows/build-push-image.yml
+++ b/.github/workflows/build-push-image.yml
@@ -2,6 +2,7 @@ name: Deploy dane-whisper-asr-worker to ghcr
 
 on:
   workflow_call:
+  workflow_dispatch:
 
 jobs:
   build-push-image:
diff --git a/.github/workflows/manual-build-push-ghcr.yml b/.github/workflows/manual-build-push-ghcr.yml
deleted file mode 100644
index 4e58deb..0000000
--- a/.github/workflows/manual-build-push-ghcr.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Manual deploy to ghcr
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-push-image:
-    uses: beeldengeluid/gha-workflows/.github/workflows/build-push-image.yml@851725b0d6bb2e3e64e48310145d65a26dccbf44 # v2024.09.02
-    secrets: inherit
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
\ No newline at end of file

From f92f925c0b017268135a6f3d3645e4d6cee252ee Mon Sep 17 00:00:00 2001
From: Govert Brinkmann <gbrinkmann@beeldengeluid.nl>
Date: Thu, 3 Oct 2024 10:36:19 +0200
Subject: [PATCH 2/3] Check for docker updates

---
 .github/dependabot.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b8a9981..89c0870 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,14 @@
 version: 2
 updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: 
+          - "version-update:semver-minor"
+          - "version-update:semver-major"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From 3e24fe506409155443535529bcd2f6bbeaae0cf8 Mon Sep 17 00:00:00 2001
From: Govert Brinkmann <gbrinkmann@beeldengeluid.nl>
Date: Thu, 3 Oct 2024 10:39:42 +0200
Subject: [PATCH 3/3] Align workflows with other projects

---
 .github/workflows/_test.yml            |  8 --------
 .github/workflows/build-push-image.yml |  4 +++-
 .github/workflows/check-project.yml    |  8 ++++++++
 .github/workflows/main.yml             | 22 ----------------------
 .github/workflows/not-main.yml         | 13 -------------
 5 files changed, 11 insertions(+), 44 deletions(-)
 delete mode 100644 .github/workflows/_test.yml
 create mode 100644 .github/workflows/check-project.yml
 delete mode 100644 .github/workflows/main.yml
 delete mode 100644 .github/workflows/not-main.yml

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
deleted file mode 100644
index b3088b6..0000000
--- a/.github/workflows/_test.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Test
-
-on:
-  workflow_call:
-
-jobs:
-  check-project:
-    uses: beeldengeluid/gha-workflows/.github/workflows/check-poetry-project.yml@add-tag-strat # v2024.09.02
\ No newline at end of file
diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
index c85ffac..3d41748 100644
--- a/.github/workflows/build-push-image.yml
+++ b/.github/workflows/build-push-image.yml
@@ -1,9 +1,11 @@
 name: Deploy dane-whisper-asr-worker to ghcr
 
 on:
+  push:
+    branches:
+    -  main
   workflow_call:
   workflow_dispatch:
-
 jobs:
   build-push-image:
     uses: beeldengeluid/gha-workflows/.github/workflows/build-push-image.yml@851725b0d6bb2e3e64e48310145d65a26dccbf44 # v2024.09.02
diff --git a/.github/workflows/check-project.yml b/.github/workflows/check-project.yml
new file mode 100644
index 0000000..f958047
--- /dev/null
+++ b/.github/workflows/check-project.yml
@@ -0,0 +1,8 @@
+name: non-main branch - test
+
+on:
+  push:
+
+jobs:
+  test:
+    uses: beeldengeluid/gha-workflows/.github/workflows/check-poetry-project.yml@71d9cba5e50f829007d4ba9391e827ddc3864d0c # v2024.09.02
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 506d61c..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: main branch - test; build & push to ghcr
-
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - README.md
-      - LICENSE
-
-jobs:
-  test:
-    uses: ./.github/workflows/_test.yml
-
-  build-push-image:
-    uses: beeldengeluid/gha-workflows/.github/workflows/build-push-image.yml@851725b0d6bb2e3e64e48310145d65a26dccbf44 # v2024.09.02
-    secrets: inherit
-    needs: [test]
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
\ No newline at end of file
diff --git a/.github/workflows/not-main.yml b/.github/workflows/not-main.yml
deleted file mode 100644
index 475f725..0000000
--- a/.github/workflows/not-main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: non-main branch - test
-
-on:
-  push:
-    branches-ignore:
-      - main
-    paths-ignore:
-      - README.md
-      - LICENSE
-
-jobs:
-  test:
-    uses: ./.github/workflows/_test.yml