ATO-762: [deploy] Removing unecessary service.

govuk-one-login · Jul 23, 2024 · 9d3f111 · 9d3f111
1 parent b8c6ba5
commit 9d3f111
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 60 deletions.
diff --git a/.github/actions/build-backend-component/action.yml b/.github/actions/build-backend-component/action.yml
diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   build-frontend-dependencies:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Build frontend
     runs-on: ubuntu-latest
     outputs:
@@ -36,7 +36,7 @@ jobs:
           artifact-name: frontend-build-demo
 
   push-frontend-image:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Push frontend image
     needs: build-frontend-dependencies
     runs-on: ubuntu-latest
@@ -61,12 +61,12 @@ jobs:
           aws-role-arn: ${{ vars.DEPLOYMENT_ROLE_ARN }}
           repository: ${{ vars.FRONTEND_CONTAINER_REPOSITORY_NAME }}
           image-tags: "${{ github.head_ref || github.ref_name }}"
-          dockerfile: Dockerfile
+          dockerfile: infrastructure/frontend/Dockerfile
           artifact-name: frontend-build-demo
           artifact-path: dist
 
   build-frontend-infrastructure:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Build frontend infrastructure
     needs: push-frontend-image
     runs-on: ubuntu-latest
@@ -104,7 +104,7 @@ jobs:
           path: .aws-sam/build
 
   deploy-frontend:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Deploy frontend
     needs: [ build-frontend-infrastructure, deploy-api, deploy-cognito, deploy-dynamodb ]
     runs-on: ubuntu-latest
@@ -157,7 +157,7 @@ jobs:
           echo "url=$url" >> "$GITHUB_OUTPUT"
 
   build-dynamo:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Build dynamodb
     runs-on: ubuntu-latest
     outputs:
@@ -168,7 +168,7 @@ jobs:
         id: build
         uses: govuk-one-login/github-actions/sam/build-application@6144f39407b01c9b25b39537b3956deca9e32620 # 22/02/2024
         with:
-          template: backend/dynamodb/cognito.template.yml
+          template: backend/dynamodb/dynamodb.template.yml
           base-dir: backend/dynamodb
           source-dir: backend/dynamodb
           cache-name: dynamodb-infra
@@ -214,7 +214,7 @@ jobs:
             DeploymentName=${{ steps.get-deployment-name.outputs.pretty-branch-name }}
 
   build-cognito:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Build cognito
     runs-on: ubuntu-latest
     outputs:
@@ -234,7 +234,7 @@ jobs:
           pull-repository: true
 
   deploy-cognito:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Deploy cognito
     needs: build-cognito
     runs-on: ubuntu-latest
@@ -259,7 +259,7 @@ jobs:
           delete-failed-stack: true
           disable-rollback: false
           stack-name-prefix: preview-cognito
-          artifact-name: backend-cognito-infrastructure
+          artifact-name: ${{ needs.build-cognito.outputs.artifact-name }}
           cache-name: ${{ needs.build-cognito.outputs.cache-key }}
           s3-prefix: sse-preview
           tags: |-
@@ -272,7 +272,7 @@ jobs:
             DeploymentName=${{ steps.get-deployment-name.outputs.pretty-branch-name }}
 
   build-api:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Build api
     runs-on: ubuntu-latest
     outputs:
@@ -293,7 +293,7 @@ jobs:
           pull-repository: true
 
   deploy-api:
-    if: contains(github.event.head_commit.message, '[deploy]') == true
+#    if: contains(github.event.head_commit.message, '[deploy]') == true
     name: Deploy api
     needs: build-api
     runs-on: ubuntu-latest
@@ -318,7 +318,7 @@ jobs:
           delete-failed-stack: true
           disable-rollback: false
           stack-name-prefix: preview-api
-          artifact-name: backend-api-infrastructure
+          artifact-name: ${{ needs.build-api.outputs.artifact-name }}
           cache-name: ${{ needs.build-api.outputs.cache-key }}
           s3-prefix: sse-preview
           tags: |-