From 58f6837eeb47584ebd016eacfb32cb91d0e59d1f Mon Sep 17 00:00:00 2001 From: andreasebner Date: Wed, 17 Nov 2021 12:38:30 +0100 Subject: [PATCH] feat(ci) reduce appveyor build options and enable fast fail strategy (#4779) --- appveyor.yml | 5 ++--- tools/appveyor/build.ps1 | 22 ++-------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5f065f36e35..ad3d9ed6737 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,8 @@ clone_folder: c:\projects\open62541 skip_branch_with_pr: true # Fast finish (stop other builds if one fails) to speed up appveyor builds -# matrix: -# fast_finish: true +matrix: + fast_finish: true environment: global: @@ -30,7 +30,6 @@ cache: - C:\ProgramData\chocolatey\bin -> tools/appveyor/install.ps1 - C:\ProgramData\chocolatey\lib -> tools/appveyor/install.ps1 - C:\tools\vcpkg\installed -> tools/appveyor/install.ps1 - #- 'c:\miktex' init: - git config --global core.autocrlf input # Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail diff --git a/tools/appveyor/build.ps1 b/tools/appveyor/build.ps1 index c81dba2fb58..bd427a555d3 100644 --- a/tools/appveyor/build.ps1 +++ b/tools/appveyor/build.ps1 @@ -28,24 +28,7 @@ try { Copy-Item README.md pack Write-Host -ForegroundColor Green "`n###################################################################" - Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with amalgamation #####`n" - New-Item -ItemType directory -Path "build" - cd build - & cmake $cmake_cnf ` - -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DUA_BUILD_EXAMPLES:BOOL=OFF ` - -DUA_ENABLE_AMALGAMATION:BOOL=ON ` - -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption .. - & cmake --build . --config RelWithDebInfo - if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) { - Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***" - exit $LASTEXITCODE - } - cd .. - Remove-Item -Path build -Recurse -Force - - Write-Host -ForegroundColor Green "`n###################################################################" - Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with full NS0 #####`n" + Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with PubSub #####`n" New-Item -ItemType directory -Path "build" cd build & cmake $cmake_cnf ` @@ -58,8 +41,7 @@ try { -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON ` -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON ` -DUA_ENABLE_PUBSUB_MQTT:BOOL=ON ` - -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS:BOOL=ON ` - -DUA_NAMESPACE_ZERO:STRING=FULL .. + -DUA_NAMESPACE_ZERO:STRING=REDUCED .. & cmake --build . --config RelWithDebInfo if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) { Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"