From e583d0b413bd7c97013c4654a677002965673779 Mon Sep 17 00:00:00 2001
From: valere <dev@valerebron.com>
Date: Mon, 2 Feb 2026 11:18:35 +0100
Subject: [PATCH 1/6] yeah

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5eca402..80d2e1c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,5 +19,5 @@ jobs:
             sed -i "s/DOMAIN=.*/DOMAIN=$DOMAIN.$BRANCH_NAME/" .env
           fi
           set -a && source .env
-          echo $DOMAIN
-          
\ No newline at end of file
+          echo $DOMAIN # should be yeah.
+          
-- 
2.49.1


From 1cec3b363849a043df4ebe44c8707be81fe23635 Mon Sep 17 00:00:00 2001
From: valere <contact@valere.dev>
Date: Mon, 2 Feb 2026 10:36:55 +0000
Subject: [PATCH 2/6] Update .github/workflows/deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 80d2e1c..1ac0555 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,6 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: test ci
         run: |
+          set -a && source .env && set +a
           REPO_NAME="${GITHUB_REPOSITORY##*/}"
           BRANCH_NAME=$GITHUB_REF_NAME
           APP_DIR="/var/docker-web/apps/$REPO_NAME"
@@ -18,6 +19,5 @@ jobs:
           if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then
             sed -i "s/DOMAIN=.*/DOMAIN=$DOMAIN.$BRANCH_NAME/" .env
           fi
-          set -a && source .env
-          echo $DOMAIN # should be yeah.
+          set -a && source .env && set +a
           
-- 
2.49.1


From d88e984b7f599a4f6a3c25b0fa6a3f68e52185cf Mon Sep 17 00:00:00 2001
From: valere <contact@valere.dev>
Date: Mon, 2 Feb 2026 10:37:22 +0000
Subject: [PATCH 3/6] Update .github/workflows/deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1ac0555..1076048 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,4 +20,4 @@ jobs:
             sed -i "s/DOMAIN=.*/DOMAIN=$DOMAIN.$BRANCH_NAME/" .env
           fi
           set -a && source .env && set +a
-          
+          echo $DOMAIN
-- 
2.49.1


From ca0799dc592cde10ceb31f1a1a49b5426ff7eabe Mon Sep 17 00:00:00 2001
From: valere <contact@valere.dev>
Date: Mon, 2 Feb 2026 10:37:50 +0000
Subject: [PATCH 4/6] Update .github/workflows/deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1076048..45111b8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
           APP_DIR="/var/docker-web/apps/$REPO_NAME"
 
           if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then
-            sed -i "s/DOMAIN=.*/DOMAIN=$DOMAIN.$BRANCH_NAME/" .env
+            sed -i "s/DOMAIN=.*/DOMAIN=$BRANCH_NAME.$DOMAIN/" .env
           fi
           set -a && source .env && set +a
           echo $DOMAIN
-- 
2.49.1


From 64b5b87567e09d434e63620801d484eb8f042de1 Mon Sep 17 00:00:00 2001
From: valere <contact@valere.dev>
Date: Mon, 2 Feb 2026 15:32:12 +0000
Subject: [PATCH 5/6] Update .github/workflows/deploy.yml

---
 .github/workflows/deploy.yml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 45111b8..fbd4706 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -9,15 +9,33 @@ jobs:
         - /var/docker-web:/var/docker-web
     steps:
       - uses: actions/checkout@v4
-      - name: test ci
+      - name: Set Vars
         run: |
           set -a && source .env && set +a
-          REPO_NAME="${GITHUB_REPOSITORY##*/}"
-          BRANCH_NAME=$GITHUB_REF_NAME
-          APP_DIR="/var/docker-web/apps/$REPO_NAME"
-
+          sed -i "s/BRANCH_NAME=.*/BRANCH_NAME=$GITHUB_REF_NAME/" .env
+          # Configuration pour les branches non-principales
           if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then
+            sed -i "s/PORT=.*/PORT=$PORT+1/" .env
             sed -i "s/DOMAIN=.*/DOMAIN=$BRANCH_NAME.$DOMAIN/" .env
+            #sed -i "s/container_name: evilspins/container_name: $BRANCH_NAME.$DOMAIN/" docker-compose.yml
+            sed -i "s/REPO_NAME=.*/REPO_NAME=$BRANCH_NAME.$DOMAIN/" .env
           fi
+          sed -i "s/REPO_NAME=.*/REPO_NAME=${GITHUB_REPOSITORY##*/}/" .env
+          sed -i "s/APP_DIR=.*/APP_DIR=/var/docker-web/apps/$REPO_NAME" .env
+      - uses: actions/checkout@v4
+      - name: Build app
+        run: |
           set -a && source .env && set +a
-          echo $DOMAIN
+          echo "2nd step, for BRANCH $BRANCH_NAME is domain correct : $DOMAIN ?" 
+
+  deploy:
+    runs-on: ubuntu-22.04
+    needs: build
+    container:
+      volumes:
+        - /var/docker-web:/var/docker-web
+    steps:
+      - uses: actions/checkout@v4
+      - name: Deploy with docker-web
+        run: |
+          echo "last step, for BRANCH $BRANCH_NAME is domain correct : $DOMAIN ?"
-- 
2.49.1


From b59578eb1fcf241b6d72bf3f29c79bca7f014995 Mon Sep 17 00:00:00 2001
From: valere <contact@valere.dev>
Date: Mon, 2 Feb 2026 16:00:58 +0000
Subject: [PATCH 6/6] Update .github/workflows/deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fbd4706..237f2d1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,7 +16,7 @@ jobs:
           # Configuration pour les branches non-principales
           if [ "$BRANCH_NAME" != "main" ] && [ "$BRANCH_NAME" != "master" ]; then
             sed -i "s/PORT=.*/PORT=$PORT+1/" .env
-            sed -i "s/DOMAIN=.*/DOMAIN=$BRANCH_NAME.$DOMAIN/" .env
+            sed -i "s#DOMAIN=.*#DOMAIN=$BRANCH_NAME.$DOMAIN#" .env
             #sed -i "s/container_name: evilspins/container_name: $BRANCH_NAME.$DOMAIN/" docker-compose.yml
             sed -i "s/REPO_NAME=.*/REPO_NAME=$BRANCH_NAME.$DOMAIN/" .env
           fi
-- 
2.49.1