MLPAB-398 - Remove redundant steps and conditions from workflows (#190)

ministryofjustice · Nov 4, 2022 · 390d5bb · 390d5bb
1 parent 0285693
commit 390d5bb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml
@@ -58,8 +58,4 @@ jobs:
           ECR_REPOSITORY: modernising-lpa/app
         run: |
           docker tag app:latest $ECR_REGISTRY/$ECR_REPOSITORY:${{ inputs.tag }}
-          if [ ${{ github.head_ref }} == "main" ]; then
-            docker tag app:latest $ECR_REGISTRY/$ECR_REPOSITORY:main-${{ inputs.tag }}
-            docker tag app:latest $ECR_REGISTRY/$ECR_REPOSITORY:latest
-          fi
-            docker push --all-tags $ECR_REGISTRY/$ECR_REPOSITORY
+          docker push --all-tags $ECR_REGISTRY/$ECR_REPOSITORY
diff --git a/.github/workflows/terraform_account_job.yml b/.github/workflows/terraform_account_job.yml
@@ -14,14 +14,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
-      - name: Extract branch name
-        run: |
-          if [ "${{ github.head_ref }}" == "" ]; then
-            echo BRANCH_NAME=main >> $GITHUB_ENV
-          else
-            echo BRANCH_NAME=${{ github.head_ref }} >> $GITHUB_ENV
-          fi
-        id: extract_branch
       - uses: unfor19/install-aws-cli-action@v1
       - uses: hashicorp/setup-terraform@v2
         with:

diff --git a/.github/workflows/terraform_environment_job.yml b/.github/workflows/terraform_environment_job.yml
@@ -30,14 +30,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
-      - name: Extract branch name
-        run: |
-          if [ "${{ github.head_ref }}" == "" ]; then
-            echo BRANCH_NAME=main >> $GITHUB_ENV
-          else
-            echo BRANCH_NAME=${{ github.head_ref }} >> $GITHUB_ENV
-          fi
-        id: extract_branch
       - uses: unfor19/install-aws-cli-action@v1
       - uses: hashicorp/setup-terraform@v2
         with:

diff --git a/.github/workflows/workflow_terraform_environment_cleanup.yml b/.github/workflows/workflow_terraform_environment_cleanup.yml
@@ -24,14 +24,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
-      - name: Extract branch name
-        run: |
-          if [ "${{ github.head_ref }}" == "" ]; then
-            echo BRANCH_NAME=main >> $GITHUB_ENV
-          else
-            echo BRANCH_NAME=${{ github.head_ref }} >> $GITHUB_ENV
-          fi
-        id: extract_branch
       - uses: unfor19/install-aws-cli-action@v1
       - uses: hashicorp/setup-terraform@v2
         with: