fix(deployment): staging deployment

UK-Export-Finance · Jun 2, 2023 · 8b95b9a · 8b95b9a
1 parent f3894d0
commit 8b95b9a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -26,8 +26,6 @@ on:
       - dev
       - staging
       - production
-      #TODO: Remove pre-merge
-      - feat/deployment
 
     paths:
       - 'src/**'
@@ -36,7 +34,7 @@ on:
 
 env:
   PRODUCT: exip
-  ENVIRONMENT: staging
+  ENVIRONMENT: ${{ github.ref_name }}
   TIMEZONE: 'Europe/London'
   # Base artifact
   FROM: latest
@@ -82,7 +80,7 @@ jobs:
           inlineScript: |
             # Basic
             az configure --defaults location=${{ vars.REGION }}
-            az configure --defaults group=rg-${{ env.PRODUCT }}-staging-${{ vars.VERSION }}
+            az configure --defaults group=rg-${{ env.PRODUCT }}-${{ github.ref_name }}-${{ vars.VERSION }}
 
     #TODO: EMS-1176: MS SQL DB setup
 
@@ -109,7 +107,7 @@ jobs:
           inlineScript: |
             # Basic
             az configure --defaults location=${{ vars.REGION }}
-            az configure --defaults group=rg-${{ env.PRODUCT }}-staging-${{ vars.VERSION }}
+            az configure --defaults group=rg-${{ env.PRODUCT }}-${{ github.ref_name }}-${{ vars.VERSION }}
 
       - name: CLI 📝
         run: |
@@ -192,7 +190,7 @@ jobs:
           inlineScript: |
             # Basic
             az configure --defaults location=${{ vars.REGION }}
-            az configure --defaults group=rg-${{ env.PRODUCT }}-staging-${{ vars.VERSION }}
+            az configure --defaults group=rg-${{ env.PRODUCT }}-${{ github.ref_name }}-${{ vars.VERSION }}
 
       - name: CLI 📝
         run: |