From c9be24cb8191e8e4aa4f08781f8dd2e3f4b6712b Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Tue, 8 Oct 2024 13:01:17 +0000
Subject: [PATCH] .github: Trigger build and publish on merge on development
 branches

---
 .github/workflows/post-merge.yaml | 20 ++++++++++++++++++++
 .github/workflows/publish.yaml    |  5 -----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/post-merge.yaml

diff --git a/.github/workflows/post-merge.yaml b/.github/workflows/post-merge.yaml
new file mode 100644
index 0000000000..ec775c0cf2
--- /dev/null
+++ b/.github/workflows/post-merge.yaml
@@ -0,0 +1,20 @@
+name: Post merge
+
+on:
+  # Push on development branch = PR merge
+  push:
+    branches:
+      - development/*
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yaml
+    secrets: inherit
+
+  publish:
+    needs:
+      - build
+    uses: ./.github/workflows/publish.yaml
+    secrets: inherit
+    with:
+      is_production: false
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index efb148fd02..4038819a35 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -19,11 +19,6 @@ on:
       ARTIFACTS_PASSWORD:
         required: true
 
-  # Push on development branch = PR merge
-  push:
-    branches:
-      - "development/**"
-
 env:
   REGISTRY_HOST: ghcr.io
   REGISTRY_PROJECT: "${{ github.repository }}"