From 2b62d689599bdaddc3c695b7cc4b32b4af35a8ac Mon Sep 17 00:00:00 2001
From: Charence <1438332+Charence@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:30:04 +0000
Subject: [PATCH] ISSUE #5403 - don't lowercase and change underscores in
 deploy

---
 .azure/build-and-deploy.yaml    |  4 ++--
 .github/workflows/onPRClose.yml | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.azure/build-and-deploy.yaml b/.azure/build-and-deploy.yaml
index 8ff7852c2f..81785c04a7 100644
--- a/.azure/build-and-deploy.yaml
+++ b/.azure/build-and-deploy.yaml
@@ -94,9 +94,9 @@ stages:
 
       - script: |
           if [[ "$SYSTEM_PULLREQUEST_SOURCEBRANCH" != "" ]]; then
-            echo '##vso[task.setvariable variable=branchName]'$( echo $SYSTEM_PULLREQUEST_SOURCEBRANCH | sed "s/_/-/" | awk '{print tolower($0)}' )
+            echo '##vso[task.setvariable variable=branchName]'$( echo $SYSTEM_PULLREQUEST_SOURCEBRANCH | awk '{print $0}' )
           else
-            echo '##vso[task.setvariable variable=branchName]'$( echo $BUILD_SOURCEBRANCHNAME | sed "s/_/-/" | awk '{print tolower($0)}' )
+            echo '##vso[task.setvariable variable=branchName]'$( echo $BUILD_SOURCEBRANCHNAME | awk '{print $0}' )
           fi
         displayName: Set new branch name value
 
diff --git a/.github/workflows/onPRClose.yml b/.github/workflows/onPRClose.yml
index baf0b099b8..4fc912388c 100644
--- a/.github/workflows/onPRClose.yml
+++ b/.github/workflows/onPRClose.yml
@@ -3,18 +3,6 @@ on:
   pull_request:
     types: [closed]
 jobs:
-  destroy-deployed-branch:
-    name: Call Azure Destroy Pipeline
-    runs-on: ubuntu-latest
-    steps:
-    - name: Azure Pipelines Action
-      uses: Azure/pipelines@v1.2
-      with:
-        azure-devops-project-url: https://dev.azure.com/3drepo/3drepo.io
-        azure-pipeline-name: 'destroy'
-        azure-devops-token: ${{ secrets.AZURE_DEVOPS_TOKEN }}
-        azure-pipeline-variables:  '{"branchName": "${{ github.head_ref || github.ref_name }}"}'
-
   get-details:
     name: Get Current Issue Details
     runs-on: ubuntu-latest
@@ -58,3 +46,15 @@ jobs:
           content_id: ${{ needs.get-details.outputs.issue-content-id }}
           field: Status
           value: Merged
+
+  destroy-deployed-branch:
+    name: Call Azure Destroy Pipeline
+    runs-on: ubuntu-latest
+    steps:
+    - name: Azure Pipelines Action
+      uses: Azure/pipelines@v1.2
+      with:
+        azure-devops-project-url: https://dev.azure.com/3drepo/3drepo.io
+        azure-pipeline-name: 'destroy'
+        azure-devops-token: ${{ secrets.AZURE_DEVOPS_TOKEN }}
+        azure-pipeline-variables:  '{"branchName": "${{ github.head_ref || github.ref_name }}"}'