diff options
author | Chris Wilson <chris+github@qwirx.com> | 2017-07-03 18:30:21 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2017-09-16 20:51:18 +0100 |
commit | 75190f42eac277e5b936c60fde6ed4274a9e740c (patch) | |
tree | 3e7c1588a8335c00d8f378adc485d83025f5bff0 | |
parent | 94ec413235f38419bf70a084a37808b6ae8bc09f (diff) |
Reorder lines in appveyor.yml to match actual execution order
(cherry picked from commit ea4f1728b529aff1dfc912d8f51567f8cd58ea77)
-rw-r--r-- | appveyor.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/appveyor.yml b/appveyor.yml index 0ec97f65..f4dac271 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,16 +37,7 @@ init: # to the generator name if you want a 64-bit build (x64 platform): - ps: $env:generator_name="$($env:Generator_Base)$(if ($env:PLATFORM.equals('x64')) {' Win64'})" -build: - parallel: true - project: ..\cmake\BoxBackup_Windows.sln - verbosity: minimal - -# Remove Xamarin to remove 500 lines of junk from build logs -# http://help.appveyor.com/discussions/problems/4569-the-target-_convertpdbfiles-listed-in-a-beforetargets-attribute-at-c-does-not-exist-in-the-project-and-will-be-ignored -before_build: - - del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" - +# scripts that run after cloning repository (before the build step, not after!) install: # test_bbackupd needs 7zip (or cmake -E tar) to extract tar archives on Windows: - cinst -y --limit-output 7zip.commandline nsis.portable @@ -74,6 +65,16 @@ install: # Leave the current directory in the correct place to find the solution file using its relative path above. +# Remove Xamarin to remove 500 lines of junk from build logs +# http://help.appveyor.com/discussions/problems/4569-the-target-_convertpdbfiles-listed-in-a-beforetargets-attribute-at-c-does-not-exist-in-the-project-and-will-be-ignored +before_build: + - del "C:\Program Files (x86)\MSBuild\4.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets" + +build: + parallel: true + project: ..\cmake\BoxBackup_Windows.sln + verbosity: minimal + test_script: - cd %CMAKE_UNIBUILD_DIR%\Build\boxbackup # - dir @@ -82,8 +83,7 @@ test_script: # - dir %PLATFORM%\%CONFIGURATION% - ctest -C %CONFIGURATION% -V --interactive-debug-mode 0 - # After running tests successfully, and before collecting artifacts, build them and copy them - # to the right place: + # After running tests successfully, build the artifacts that we want to upload: - cmake --build . --config %CONFIGURATION% --target package # AppVeyor refuses to package files outside of the project directory, so we need to push them: |