diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-09-27 05:18:19 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-09-27 05:18:19 +0300 |
| commit | d4149fbbe6cc0308d07267dd80ea9c325f57beb8 (patch) | |
| tree | 24bbbc014e62fcb97c19bf495a02a4a395860a68 | |
| parent | 417c9f32d6576d5243d96f0a75792745bbc9cb55 (diff) | |
ci
| -rw-r--r-- | .ci.cmake | 20 | ||||
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
3 files changed, 18 insertions, 16 deletions
@@ -21,20 +21,20 @@ if(WIN32) checked_execute_process("Tarring up binaries 1" COMMAND "${CMAKE_COMMAND}" -E make_directory afio/prebuilt/bin/Release COMMAND "${CMAKE_COMMAND}" -E make_directory afio/prebuilt/lib/Release - COMMAND xcopy "doc" "afio\\doc\\" /s /q - COMMAND xcopy "include" "afio\\include\\" /s /q + COMMAND xcopy doc afio\\doc\\ /s /q + COMMAND xcopy include afio\\include\\ /s /q ) checked_execute_process("Tarring up binaries 2" - COMMAND copy "Readme.md" "afio\\" - COMMAND copy "release_notes.md" "afio\\" + COMMAND copy Readme.md afio\\ + COMMAND copy release_notes.md afio\\ ) checked_execute_process("Tarring up binaries 3" - COMMAND copy "prebuilt\\lib\\Release\\afio_sl-2.0-Windows-x64-Release.lib" "afio\\prebuilt\\lib\\Release\\" - COMMAND copy "prebuilt\\lib\\Release\\ntkernel-error-category_sl.lib" "afio\\prebuilt\\lib\\Release\\" - COMMAND copy "prebuilt\\lib\\Release\\afio_dl-2.0-Windows-x64-Release.lib" "afio\\prebuilt\\lib\\Release\\" - COMMAND copy "prebuilt\\lib\\Release\\ntkernel-error-category_dl.lib" "afio\\prebuilt\\lib\\Release\\" - COMMAND copy "prebuilt\\bin\\Release\\afio_dl-2.0-Windows-x64-Release.dll" "afio\\prebuilt\\bin\\Release\\" - COMMAND copy "prebuilt\\bin\\Release\\ntkernel-error-category_dl.dll" "afio\\prebuilt\\bin\\Release\\" + COMMAND copy prebuilt\\lib\\Release\\afio_sl-2.0-Windows-x64-Release.lib afio\\prebuilt\\lib\\Release\\ + COMMAND copy prebuilt\\lib\\Release\\ntkernel-error-category_sl.lib afio\\prebuilt\\lib\\Release\\ + COMMAND copy prebuilt\\lib\\Release\\afio_dl-2.0-Windows-x64-Release.lib afio\\prebuilt\\lib\\Release\\ + COMMAND copy prebuilt\\lib\\Release\\ntkernel-error-category_dl.lib afio\\prebuilt\\lib\\Release\\ + COMMAND copy prebuilt\\bin\\Release\\afio_dl-2.0-Windows-x64-Release.dll afio\\prebuilt\\bin\\Release\\ + COMMAND copy prebuilt\\bin\\Release\\ntkernel-error-category_dl.dll afio\\prebuilt\\bin\\Release\\ ) checked_execute_process("Tarring up binaries 4" COMMAND 7za a -tzip afio-v2.0-binaries-win64.zip afio\\ diff --git a/.travis.yml b/.travis.yml index a3c466d9..c1c289e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,14 @@ addons: - cmake - cmake-data -secure: "A3TeWTlJdjUaQ31NF60kMOik8mzaJkdKA55jZXjN83BJ2ZjMDmWfq1XmZ7iDIxmn7HC2BVpjhdkj9jpRtPztb08L5VSlJIiVbXlBWNwgzmYANujpR9rA+bhZJwlKDaYQHUZUd4+iGHCHb0dLt2HG0eHF5azaifd0YqCfz5GcWl8=" env: - - __="cmake tests" NAME=TravisLinuxWorker - - __="Documentation" NAME=TravisDocumentation - - __="Programs" + global: + - secure: "A3TeWTlJdjUaQ31NF60kMOik8mzaJkdKA55jZXjN83BJ2ZjMDmWfq1XmZ7iDIxmn7HC2BVpjhdkj9jpRtPztb08L5VSlJIiVbXlBWNwgzmYANujpR9rA+bhZJwlKDaYQHUZUd4+iGHCHb0dLt2HG0eHF5azaifd0YqCfz5GcWl8=" + matrix: + - __="cmake tests" NAME=TravisLinuxWorker + - __="Documentation" NAME=TravisDocumentation + - __="Programs" matrix: exclude: diff --git a/appveyor.yml b/appveyor.yml index 6be18307..95451e51 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,8 +34,8 @@ on_success: on_failure: on_finish: - dir afio - - set "NEWNAME=afio-v2.0-binaries-win64-%date:~10,4%%date:~4,2%%date:~7,2%%time:~0,2%%time:~3,2%.zip" - - echo %NEWNAME% +# - set "NEWNAME=afio-v2.0-binaries-win64-%date:~10,4%%date:~4,2%%date:~7,2%%time:~0,2%%time:~3,2%.zip" + - set "NEWNAME=afio-v2.0-binaries-win64-%APPVEYOR_REPO_COMMIT%.zip" - rename afio-v2.0-binaries-win64.zip "%NEWNAME" - curl -T "%NEWNAME%" -u jenkins-nedprod:%JENKINS_NEDPROD_PASSWORD% https://dedi4.nedprod.com/static/files/upload/ - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path prebuilt\merged_junit_results.xml)) |