diff --git a/.github/workflows/deploy_demo.yml b/.github/workflows/deploy_demo.yml index ff23849b..c707c854 100644 --- a/.github/workflows/deploy_demo.yml +++ b/.github/workflows/deploy_demo.yml @@ -85,7 +85,7 @@ jobs: - name: Reset Demo environment if: github.event.inputs.reset_demo == 'true' run: | - + echo "Cleaning up TeamCloud SVC resources" az group delete --subscription ${{ secrets.TEAMCLOUD_SUBSCRIPTION }} -n TeamCloud -y while read SUBSCRIPTIONID; do @@ -97,18 +97,26 @@ jobs: done < <( az account list --refresh --only-show-errors --query "[?(starts_with(@.name, 'TeamCloud DEMO'))].id" -o tsv ) - - name: Deploy Demo environment + - name: Install teamcloud cli extension run: | - echo "installing teamcloud cli extension" az extension add -s ${{steps.get-cli.outputs.result}} -y + - name: Deploy fresh Demo environment + if: github.event.inputs.reset_demo == 'true' + run: | echo "deploying demo teamcloud instance" - az tc deploy --subscription ${{ secrets.TEAMCLOUD_SUBSCRIPTION }} -l eastus --principal-name ${{ secrets.TEAMCLOUD_RM_USERNAME }} --principal-password ${{ secrets.TEAMCLOUD_RM_PASSWORD }} --client-id ${{ secrets.TEAMCLOUD_WEB_USERNAME }} --scope ${{ secrets.TEAMCLOUD_WEB_SCOPE }} -v ${{steps.resolve-tag.outputs.result}} --skip-name-validation ${{ github.event.inputs.reset_demo }} -n teamclouddemo + az tc deploy --subscription ${{ secrets.TEAMCLOUD_SUBSCRIPTION }} -l eastus --principal-name ${{ secrets.TEAMCLOUD_RM_USERNAME }} --principal-password ${{ secrets.TEAMCLOUD_RM_PASSWORD }} --client-id ${{ secrets.TEAMCLOUD_WEB_USERNAME }} --scope ${{ secrets.TEAMCLOUD_WEB_SCOPE }} -v ${{steps.resolve-tag.outputs.result}} -n teamclouddemo echo "adding webhooks to acr" az deployment group create --subscription ${{ secrets.TEAMCLOUD_SUBSCRIPTION }} -g TeamCloud -f ./deploy/bicep/webhooks.bicep -p registrySubscriptionId=${{ secrets.TEAMCLOUD_ACR_SUBSCRIPTION }} + - name: Re-deploy Demo environment + if: github.event.inputs.reset_demo == 'false' + run: | + echo "deploying demo teamcloud instance" + az tc deploy --subscription ${{ secrets.TEAMCLOUD_SUBSCRIPTION }} -l eastus --principal-name ${{ secrets.TEAMCLOUD_RM_USERNAME }} --principal-password ${{ secrets.TEAMCLOUD_RM_PASSWORD }} --client-id ${{ secrets.TEAMCLOUD_WEB_USERNAME }} --scope ${{ secrets.TEAMCLOUD_WEB_SCOPE }} -v ${{steps.resolve-tag.outputs.result}} --skip-name-validation -n teamclouddemo + - name: Logout Azure CLI if: ${{ always() }} run: az logout diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 931c7584..51fd5f03 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -152,8 +152,11 @@ "args": [ "scripts/get-url.py" ], - "isBackground": true, - "problemMatcher": [] + "problemMatcher": [], + "presentation": { + "reveal": "silent", + "close": true + } }, { "label": "npm: start",