File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 7474 secrets : inherit
7575
7676 deploy :
77- if : always () && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)
77+ if : " !cancelled () && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)"
7878 needs : docker-build
7979 uses : ./.github/workflows/job-deploy.yml
8080 with :
9494 secrets : inherit
9595
9696 e2e-test :
97- if : always () && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEBAPP_URL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))
97+ if : " !cancelled () && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEBAPP_URL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
9898 needs : [docker-build, deploy]
9999 uses : ./.github/workflows/test-automation-v2.yml
100100 with :
@@ -105,7 +105,7 @@ jobs:
105105 secrets : inherit
106106
107107 send-notification :
108- if : always()
108+ if : " !cancelled() "
109109 needs : [docker-build, deploy, e2e-test]
110110 uses : ./.github/workflows/job-send-notification.yml
111111 with :
Original file line number Diff line number Diff line change @@ -329,7 +329,7 @@ jobs:
329329 deploy-linux :
330330 name : Deploy on Linux
331331 needs : azure-setup
332- if : inputs.runner_os == 'ubuntu-latest' && always () && needs.azure-setup.result == 'success'
332+ if : inputs.runner_os == 'ubuntu-latest' && !cancelled () && needs.azure-setup.result == 'success'
333333 uses : ./.github/workflows/job-deploy-linux.yml
334334 with :
335335 ENV_NAME : ${{ needs.azure-setup.outputs.ENV_NAME }}
@@ -347,7 +347,7 @@ jobs:
347347 deploy-windows :
348348 name : Deploy on Windows
349349 needs : azure-setup
350- if : inputs.runner_os == 'windows-latest' && always () && needs.azure-setup.result == 'success'
350+ if : inputs.runner_os == 'windows-latest' && !cancelled () && needs.azure-setup.result == 'success'
351351 uses : ./.github/workflows/job-deploy-windows.yml
352352 with :
353353 ENV_NAME : ${{ needs.azure-setup.outputs.ENV_NAME }}
You can’t perform that action at this time.
0 commit comments