added workflow v2

DFE-Digital · Sep 15, 2023 · 9917bca · 9917bca
1 parent c7d22a4
commit 9917bca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/actions/deploy_v2/action.yml b/.github/workflows/actions/deploy_v2/action.yml
@@ -57,14 +57,14 @@ runs:
     - name: Terraform init, plan & apply
       if: ${{ inputs.environment }} == "review_aks"
       shell: bash
-      run: make ci ${{ inputs.environment }} terraform-plan-aks PR_NUMBER=${{ inputs.pr }}
+      run: make ci ${{ inputs.environment }}_aks terraform-plan-aks PR_NUMBER=${{ inputs.pr }}
       env:
         IMAGE_TAG: ${{ inputs.sha }}
 
 
     - name: Terraform init, plan & apply
       if: ${{ inputs.environment }} != "review_aks"
       shell: bash
-      run: make ci ${{ inputs.environment }} terraform-plan-aks
+      run: make ci ${{ inputs.environment }}_aks terraform-plan-aks
       env:
         IMAGE_TAG: ${{ inputs.sha }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -346,7 +346,7 @@ jobs:
     steps:
       - name: Set matrix environments (Push to master)
         # if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        run: echo "MATRIX_ENVIRONMENTS={\"environment\":[\"development_aks\"]}" >> $GITHUB_ENV
+        run: echo "MATRIX_ENVIRONMENTS={\"environment\":[\"Development\"]}" >> $GITHUB_ENV
 
       # - name: Set matrix environments ( Review)
         # if: github.event_name == 'pull_request' && github.ref != 'refs/heads/master'
@@ -474,7 +474,7 @@ jobs:
       #     GITHUB_TOKEN:      ${{ secrets.GITHUB_TOKEN }}
 
       - name: Trigger Deployment to ${{matrix.environment}}
-        if: (matrix.environment != 'review_aks') && (contains(matrix.environment,'aks'))
+        if: (matrix.environment != 'Review')
         uses: ./.github/workflows/actions/deploy_v2
         with:
           environment: ${{matrix.environment}}