lail/ebs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CICD does not work when merging from another repo (pull requests)

Browse source
This commit is contained in:
Slim Amamou 2025-08-27 10:47:06 +01:00
parent 78a42dfbf2
commit e841242584
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View file

@ -5,19 +5,21 @@ on:
jobs: jobs:
build-push-php: build-push-php:
environment: PROD
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
steps: steps:
- name: Build/Push - name: Build/Push
uses: coopTilleuls/action-docker-build-push@v10 uses: coopTilleuls/action-docker-build-push@v10
with: with:
IMAGE_NAME: ${{ vars.IMAGE_NAME_PHP }} IMAGE_NAME: ${{ env.IMAGE_NAME_PHP }}
BUILD_CONTEXT: . BUILD_CONTEXT: .
BUILD_TARGET: app_php BUILD_TARGET: app_php
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }}
build-push-caddy: build-push-caddy:
environment: PROD
# Same Dockerfile as php, with a build target which is after # Same Dockerfile as php, with a build target which is after
needs: [build-push-php] needs: [build-push-php]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -26,8 +28,8 @@ jobs:
- name: Build/Push - name: Build/Push
uses: coopTilleuls/action-docker-build-push@v10 uses: coopTilleuls/action-docker-build-push@v10
with: with:
IMAGE_NAME: ${{ vars.IMAGE_NAME_CADDY }} IMAGE_NAME: ${{ env.IMAGE_NAME_CADDY }}
BUILD_CONTEXT: . BUILD_CONTEXT: .
BUILD_TARGET: app_caddy BUILD_TARGET: app_caddy
REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }}

14
.github/workflows/cd.yml vendored
View file

@ -1,5 +1,8 @@
name: CD name: CD
env:
IMAGE_NAME_PHP: ebs-php
IMAGE_NAME_CADDY: ebs-caddy
on: on:
push: push:
@ -18,17 +21,6 @@ permissions:
packages: write packages: write
jobs: 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: build:
name: Build name: Build
uses: ./.github/workflows/build.yml uses: ./.github/workflows/build.yml

6
.github/workflows/deploy.yml vendored
View file

@ -53,12 +53,12 @@ jobs:
id: meta id: meta
run: | run: |
set -xo pipefail set -xo pipefail
PROJECT=${{ vars.PROJECT_NAME }} PROJECT=${{ env.PROJECT_NAME }}
# Tags are deployed in prod # Tags are deployed in prod
CONTEXT=prod CONTEXT=prod
ENVIRONMENT=prod ENVIRONMENT=prod
PHP_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_PHP }} PHP_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_PHP }}
CADDY_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_CADDY }} CADDY_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_CADDY }}
IMAGE_TAG=sha-${GITHUB_SHA::7} IMAGE_TAG=sha-${GITHUB_SHA::7}
RELEASE_NAME=prod RELEASE_NAME=prod
TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g') TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g')