From b8cc3d277d077779dbd4c8c46681ae04bccbabfc Mon Sep 17 00:00:00 2001
From: valere <dev@valerebron.com>
Date: Tue, 3 Feb 2026 15:08:43 +0100
Subject: [PATCH] clean CI

---
 .github/workflows/merge.yml                | 23 ++++++++++++++++++++++
 .github/workflows/{deploy.yml => push.yml} |  1 +
 .github/workflows/setup-env.sh             |  0
 app/pages/index.vue                        |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/merge.yml
 rename .github/workflows/{deploy.yml => push.yml} (96%)
 mode change 100755 => 100644 .github/workflows/setup-env.sh

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 0000000..e883efe
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,23 @@
+name: Delete Merged Branches
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  delete-branch:
+    runs-on: ubuntu-22.04
+    container:
+      volumes:
+        - /var/docker-web:/var/docker-web
+    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Delete merged branch
+        run: |
+          BRANCH_NAME="${{ github.event.pull_request.head.ref || github.event.inputs.branch_name }}"
+          APP_NAME="${BRANCH_NAME}_${GITHUB_REPOSITORY##*/}"
+          if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "develop" ] && [ -n "$APP_NAME" ]; then
+            bash /var/docker-web/src/cli.sh rm -y "${APP_NAME}"
+          else
+            echo "Cannot delete protected branch: $BRANCH_NAME"
+          fi
diff --git a/.github/workflows/deploy.yml b/.github/workflows/push.yml
similarity index 96%
rename from .github/workflows/deploy.yml
rename to .github/workflows/push.yml
index 0083950..ecf8842 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/push.yml
@@ -14,6 +14,7 @@ jobs:
           bash ./.github/workflows/setup-env.sh
           set -a && source .env && set +a
           if [ -n "$APP_NAME" ]; then
+            set -a && source .env && set +a
             bash /var/docker-web/src/cli.sh down "${APP_NAME}"
             rm -rf "$APP_DIR"
             mkdir "$APP_DIR"
diff --git a/.github/workflows/setup-env.sh b/.github/workflows/setup-env.sh
old mode 100755
new mode 100644
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 880773c..f3afffb 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,5 +1,5 @@
 <template>
   <div>
-    here is the New front
+    here is the New New front
   </div>
 </template>