Merge pull request #3261 from UK-Export-Finance/chore/EMS-3963

chore(EMS-3963): merge main-iterations into main

.cspell.json

@@ -44,9 +44,11 @@
         "BBALIBOR",
         "behaviour",
         "BKENGB",
+        "Bbkeng2l",
         "Bloggs",
         "BLPU",
         "BUKB",
+        "CABEI",
         "centralised",
         "CICD",
         "CILC",
@@ -129,8 +131,10 @@
         "snet",
         "spectaql",
         "sqldb",
+        "Spys",
         "srcs",
         "ssword",
+        "Spys",
         "startdate",
         "szenius",
         "TOID",

.github/modules/retry/action.yml

@@ -0,0 +1,22 @@
+name: "Retry Steps"
+inputs:
+  command:
+    required: true
+  working-directory:
+    required: false
+    default: "./"
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        limit=3
+        run=1
+        until [ $run -gt $limit ]
+        do
+          cd ${{ inputs.working-directory }} && ${{ inputs.command }} && break
+          run=$((run + 1))
+        done
+        if [ $run -gt $limit ]; then
+          exit 1
+        fi
+      shell: bash

.github/workflows/deploy.sh

@@ -25,9 +25,6 @@ if [ -n "$selection" ]; then
         ############### DEVELOPMENT ###############
         if [ "$destination" = "dev" ]; then
             branch=main
-        ############### FEATURE ###############
-        elif [ "$destination" = "feature" ]; then
-            branch=main-iterations
         ############### STAGING ###############
         elif [ "$destination" = "staging" ]; then
             branch=dev

.github/workflows/deployment.yml

@@ -24,7 +24,6 @@ on:
   push:
     branches:
       - dev
-      - feature
       - staging
       - production
 

.github/workflows/infrastructure.yml

@@ -69,7 +69,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: |
           echo "TYPE=Preproduction"  >> $GITHUB_ENV
           echo "DB_SKU=${{ VARS.DB_NON_PROD_SKU }}"  >> $GITHUB_ENV
@@ -340,7 +340,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫
@@ -543,7 +543,7 @@ jobs:
             --policy-name waf${{ env.PRODUCT }}${{ env.TARGET }}${{ vars.VERSION }}
 
       - name: VPN 🧱
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         uses: azure/cli@v2
         with:
           inlineScript: |
@@ -593,7 +593,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫
@@ -731,7 +731,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫
@@ -887,7 +887,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫
@@ -1011,7 +1011,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫
@@ -1088,7 +1088,7 @@ jobs:
     runs-on: [self-hosted, EXIP, infrastructure]
     steps:
       - name: Pre-production 💫
-        if: contains('["dev", "feature", "staging"]', env.TARGET)
+        if: contains('["dev", "staging"]', env.TARGET)
         run: echo "TYPE=Preproduction" >> $GITHUB_ENV
 
       - name: Production 💫

.github/workflows/lint.yml

@@ -48,7 +48,7 @@ on:
   pull_request:
     branches: [main, main-*]
     paths:
-      - '.github/workflows/lint.yml'
+      - '.github/workflows/**'
       - 'src/**'
       - 'e2e-tests/**'
       - 'generate-exip-pricing-grid/**'