Always kill processes and remove direct reference to component governance task (#7793)
This commit is contained in:
parent
6252351da7
commit
fbaa3e8b77
|
|
@ -79,10 +79,6 @@ jobs:
|
||||||
displayName: Run sign check
|
displayName: Run sign check
|
||||||
condition: eq(variables['_SignType'], 'real')
|
condition: eq(variables['_SignType'], 'real')
|
||||||
|
|
||||||
# Detect OSS Components in use in the product. Only needs to run on one OS in the matrix.
|
|
||||||
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
|
|
||||||
displayName: Detect components
|
|
||||||
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- name: Windows_Packages
|
- name: Windows_Packages
|
||||||
path: artifacts/packages/
|
path: artifacts/packages/
|
||||||
|
|
|
||||||
|
|
@ -140,21 +140,26 @@ jobs:
|
||||||
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
||||||
- script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
- script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
||||||
displayName: Run build.cmd
|
displayName: Run build.cmd
|
||||||
- powershell: eng\scripts\KillProcesses.ps1
|
|
||||||
displayName: Kill processes
|
|
||||||
condition: always()
|
|
||||||
- ${{ if ne(parameters.agentOs, 'Windows') }}:
|
- ${{ if ne(parameters.agentOs, 'Windows') }}:
|
||||||
- script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
- script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
||||||
displayName: Run build.sh
|
displayName: Run build.sh
|
||||||
- script: eng/scripts/KillProcesses.sh
|
|
||||||
displayName: Kill processes
|
|
||||||
condition: always()
|
|
||||||
- ${{ if ne(parameters.buildScript, '') }}:
|
- ${{ if ne(parameters.buildScript, '') }}:
|
||||||
- script: $(BuildScript) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
- script: $(BuildScript) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
|
||||||
displayName: run $(BuildScript)
|
displayName: run $(BuildScript)
|
||||||
|
|
||||||
- ${{ parameters.afterBuild }}
|
- ${{ parameters.afterBuild }}
|
||||||
|
|
||||||
|
- ${{ if eq(parameters.agentOs, 'Windows') }}:
|
||||||
|
- powershell: eng\scripts\KillProcesses.ps1
|
||||||
|
displayName: Kill processes
|
||||||
|
continueOnError: true
|
||||||
|
condition: always()
|
||||||
|
- ${{ if ne(parameters.agentOs, 'Windows') }}:
|
||||||
|
- script: eng/scripts/KillProcesses.sh
|
||||||
|
displayName: Kill processes
|
||||||
|
continueOnError: true
|
||||||
|
condition: always()
|
||||||
|
|
||||||
- task: PublishTestResults@2
|
- task: PublishTestResults@2
|
||||||
displayName: Publish test results
|
displayName: Publish test results
|
||||||
condition: always()
|
condition: always()
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,26 @@
|
||||||
$ErrorActionPreference = 'Continue'
|
$ErrorActionPreference = 'Continue'
|
||||||
|
|
||||||
taskkill /T /F /IM dotnet.exe
|
function _kill($processName) {
|
||||||
taskkill /T /F /IM testhost.exe
|
try {
|
||||||
taskkill /T /F /IM iisexpress.exe
|
# Redirect stderr to stdout to avoid big red blocks of output in Azure Pipeline logging
|
||||||
taskkill /T /F /IM iisexpresstray.exe
|
# when there are no instances of the process
|
||||||
taskkill /T /F /IM w3wp.exe
|
& cmd /c "taskkill /T /F /IM ${processName} 2>&1"
|
||||||
taskkill /T /F /IM msbuild.exe
|
} catch {
|
||||||
taskkill /T /F /IM vbcscompiler.exe
|
Write-Host "Failed to kill ${processName}: $_"
|
||||||
taskkill /T /F /IM git.exe
|
}
|
||||||
taskkill /T /F /IM vctip.exe
|
}
|
||||||
taskkill /T /F /IM chrome.exe
|
|
||||||
taskkill /T /F /IM h2spec.exe
|
_kill dotnet.exe
|
||||||
|
_kill testhost.exe
|
||||||
|
_kill iisexpress.exe
|
||||||
|
_kill iisexpresstray.exe
|
||||||
|
_kill w3wp.exe
|
||||||
|
_kill msbuild.exe
|
||||||
|
_kill vbcscompiler.exe
|
||||||
|
_kill git.exe
|
||||||
|
_kill vctip.exe
|
||||||
|
_kill chrome.exe
|
||||||
|
_kill h2spec.exe
|
||||||
iisreset /restart
|
iisreset /restart
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue