Merge branch 'main' into MLPAB-1346

ministryofjustice · Oct 3, 2023 · a0c19a6 · a0c19a6
2 parents 1691c5a + 4fd0af5
commit a0c19a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/tags_job.yml b/.github/workflows/tags_job.yml
@@ -62,6 +62,9 @@ jobs:
           workspace=${workspace//\/}
           workspace=${workspace:0:11}
           workspace=$(echo ${workspace} | tr '[:upper:]' '[:lower:]')
+          if ${{ contains(fromJSON('["MLPAB-1419-use-a-single-persistent-environment-for-weblate-changes-optimise-workflow", "weblate-pr"]'), github.head_ref) }}; then
+            workspace="weblate"
+          fi
           echo "name=${workspace}" >> $GITHUB_OUTPUT
           echo ${workspace}
     outputs:

diff --git a/.github/workflows/terraform_environment_job.yml b/.github/workflows/terraform_environment_job.yml
@@ -157,7 +157,7 @@ jobs:
             }
 
       - name: Protect environment workspace
-        if: github.workflow == '[Workflow] PR'
+        if: github.event_name == 'pull_request' && inputs.workspace_name != 'weblate'
         env:
           TF_WORKSPACE: ${{ inputs.workspace_name }}
           TF_VAR_container_version: ${{ inputs.version_tag }}

diff --git a/.github/workflows/workflow_pr.yml b/.github/workflows/workflow_pr.yml
@@ -96,6 +96,7 @@ jobs:
     with:
       run_against_image: true
       tag: ${{ needs.create_tags.outputs.version_tag }}
+      smoke: ${{ contains(fromJSON('["MLPAB-1419-use-a-single-persistent-environment-for-weblate-changes-optimise-workflow", "weblate-pr"]'), github.head_ref) }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_ACTIONS }}
       aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_ACTIONS }}

diff --git a/scripts/workspace_cleanup.sh b/scripts/workspace_cleanup.sh
@@ -13,7 +13,7 @@ fi
 export TF_EXIT_CODE="0"
 
 in_use_workspaces=( "$@" )
-reserved_workspaces=( "default" "production" "preproduction" "ur" "demo")
+reserved_workspaces=( "default" "production" "preproduction" "ur" "demo" "weblate" )
 
 protected_workspaces=( "${in_use_workspaces[@]} ${reserved_workspaces[@]}" )
 all_workspaces=$(terraform workspace list|sed 's/*//g')