From a65af125ada41c701177867d47a5c24d407bf4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?= =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?= Date: Tue, 25 Nov 2025 09:25:19 +0200 Subject: [PATCH] Update github action file --- .../prevent-invalid-branch-merges.yml | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prevent-invalid-branch-merges.yml b/.github/workflows/prevent-invalid-branch-merges.yml index c0b8c6b63..e10c2e26b 100644 --- a/.github/workflows/prevent-invalid-branch-merges.yml +++ b/.github/workflows/prevent-invalid-branch-merges.yml @@ -25,6 +25,8 @@ on: - dev_odex25_ensan - dev_odex25_helpdesk - dev_odex25_donation + - dev_odex25_benefit + - dev_odex25_takaful - preprod_odex-event - preprod_odex25_accounting @@ -47,6 +49,8 @@ on: - preprod_odex25_ensan - preprod_odex25_helpdesk - preprod_odex25_donation + - preprod_odex25_benefit + - preprod_odex25_takaful - master_odex-event - master_odex25_accounting @@ -69,7 +73,8 @@ on: - master_odex25_ensan - master_odex25_helpdesk - master_odex25_donation - + - master_odex25_benefit + - master_odex25_takaful jobs: @@ -188,6 +193,17 @@ jobs: exit 1 fi + if [[ "${{ github.base_ref }}" == "preprod_odex25_benefit" && "${{ github.head_ref }}" != "dev_odex25_benefit" ]]; then + echo "::error ::You can only merge to 'preprod_odex25_donation' from 'dev_odex25_donation' branch!" + exit 1 + fi + + if [[ "${{ github.base_ref }}" == "preprod_odex25_takaful" && "${{ github.head_ref }}" != "dev_odex25_takaful" ]]; then + echo "::error ::You can only merge to 'preprod_odex25_donation' from 'dev_odex25_donation' branch!" + exit 1 + fi + + # ✅ Master Branches if [[ "${{ github.base_ref }}" == "master_odex-event" && "${{ github.head_ref }}" != "preprod_odex-event" ]]; then echo "::error ::You can only merge to 'master_odex-event' from 'preprod_odex-event' branch!" @@ -294,6 +310,19 @@ jobs: exit 1 fi + if [[ "${{ github.base_ref }}" == "master_odex25_benefit" && "${{ github.head_ref }}" != "preprod_odex25_benefit" ]]; then + echo "::error ::You can only merge to 'master_odex25_donation' from 'preprod_odex25_donation' branch!" + exit 1 + fi + + if [[ "${{ github.base_ref }}" == "master_odex25_takaful" && "${{ github.head_ref }}" != "preprod_odex25_takaful" ]]; then + echo "::error ::You can only merge to 'master_odex25_donation' from 'preprod_odex25_donation' branch!" + exit 1 + fi + + + + # ❌ Block ALL merges to 'master' if [[ "${{ github.base_ref }}" == "master" ]]; then @@ -301,4 +330,4 @@ jobs: exit 1 fi - echo "Merge validation passed." \ No newline at end of file + echo "Merge validation passed."