Skip to content

Commit

Permalink
ISSUE #5403 - don't lowercase and change underscores in deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
Charence committed Feb 14, 2025
1 parent fb794c5 commit 2b62d68
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .azure/build-and-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/onPRClose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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
Expand Down Expand Up @@ -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/[email protected]
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 }}"}'

0 comments on commit 2b62d68

Please sign in to comment.