From a94316675c7da29d5270e3bc91ba990e32d91a76 Mon Sep 17 00:00:00 2001
From: Slim Amamou <slim@les-tilleuls.coop>
Date: Wed, 27 Aug 2025 13:51:44 +0100
Subject: [PATCH] Revert "Fix CICD does not work when merging from another repo
 (pull requests)"

This reverts commit e841242584ac981ae733ba69e9da9631d3f880f4.
---
 .github/workflows/build.yml  | 10 ++++------
 .github/workflows/cd.yml     | 14 +++++++++++---
 .github/workflows/deploy.yml |  6 +++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b8ac31..b104e50 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,21 +5,19 @@ on:
 
 jobs:
   build-push-php:
-    environment: PROD
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
     - name: Build/Push
       uses: coopTilleuls/action-docker-build-push@v10
       with:
-        IMAGE_NAME: ${{ env.IMAGE_NAME_PHP }}
+        IMAGE_NAME: ${{ vars.IMAGE_NAME_PHP }}
         BUILD_CONTEXT: .
         BUILD_TARGET: app_php
         REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
-        IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }}
+        IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }}
          
   build-push-caddy:
-    environment: PROD
     # Same Dockerfile as php, with a build target which is after
     needs: [build-push-php]
     runs-on: ubuntu-latest
@@ -28,8 +26,8 @@ jobs:
     - name: Build/Push
       uses: coopTilleuls/action-docker-build-push@v10
       with:
-        IMAGE_NAME: ${{ env.IMAGE_NAME_CADDY }}
+        IMAGE_NAME: ${{ vars.IMAGE_NAME_CADDY }}
         BUILD_CONTEXT: .
         BUILD_TARGET: app_caddy
         REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
-        IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }}
+        IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }}
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 4066f05..44a516e 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,8 +1,5 @@
 name: CD
 
-env:
-  IMAGE_NAME_PHP: ebs-php
-  IMAGE_NAME_CADDY: ebs-caddy
 
 on:
   push:
@@ -21,6 +18,17 @@ permissions:
   packages: write
 
 jobs:
+  # remove-deploy-label:
+  #   name: Remove deploy label
+  #   if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy')
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: mondeja/remove-labels-gh-action@v1
+  #       with:
+  #         token: ${{ secrets.GITHUB_TOKEN }}
+  #         labels: |
+  #           deploy
+
   build:
     name: Build
     uses: ./.github/workflows/build.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9091317..947e8be 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -53,12 +53,12 @@ jobs:
         id: meta
         run: |
           set -xo pipefail
-          PROJECT=${{ env.PROJECT_NAME }}
+          PROJECT=${{ vars.PROJECT_NAME }}
           # Tags are deployed in prod
           CONTEXT=prod
           ENVIRONMENT=prod
-          PHP_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_PHP }}
-          CADDY_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_CADDY }}
+          PHP_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_PHP }}
+          CADDY_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_CADDY }}
           IMAGE_TAG=sha-${GITHUB_SHA::7}
           RELEASE_NAME=prod
           TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g')