Skip to content

Commit

Permalink
Merge branch 'feature/azure-pipelines' of github.com:riganti/dotvvm i…
Browse files Browse the repository at this point in the history
…nto feature/azure-pipelines
  • Loading branch information
cafour committed Jun 12, 2021
2 parents cc0cfb7 + 6393532 commit a5fd6c6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions .azure/pipelines/ci.yml
Expand Up @@ -69,6 +69,7 @@ jobs:
- pwsh: .\ci\windows\run.ps1
displayName: run.ps1
failOnStderr: false
errorActionPreference: continue
env:
GITHUB_TOKEN: $(GitHub.Token)
- task: PublishTestResults@2
Expand Down
2 changes: 2 additions & 0 deletions ci/linux/run.sh
Expand Up @@ -291,3 +291,5 @@ if [ $UI_TESTS -eq 1 ]; then
kill $XVFB_PID $SAMPLES_PID $SAMPLES_API_PID 2>/dev/null
clean_uitest
fi

ps
4 changes: 3 additions & 1 deletion ci/windows/run.ps1
Expand Up @@ -110,7 +110,7 @@ if ($NoSlnRestore -ne $true) {
}

# seleniumconfig.json needs to be copied before the build of the sln
if ($NoUITests -eq $true) {
if ($NoUITests -ne $true) {
$profilePath="$samplesDir\Profiles\$SamplesProfile"

if (Test-Path -PathType Leaf -Path $profilePath) {
Expand Down Expand Up @@ -177,3 +177,5 @@ if ($NoUITests -ne $true) {
Clean-UITest
}
}

Get-Process

0 comments on commit a5fd6c6

Please sign in to comment.