diff options
| -rw-r--r-- | .ci.cmake | 11 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | appveyor.yml | 8 |
3 files changed, 16 insertions, 8 deletions
@@ -26,11 +26,14 @@ if(WIN32) COMMAND "${CMAKE_COMMAND}" -E copy Readme.md afio/ COMMAND "${CMAKE_COMMAND}" -E copy release_notes.md afio/ COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/Release/afio_sl-2.0-Windows-x64-Release.lib afio/prebuilt/lib/Release/ + COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/Release/ntkernel-error-category_sl.lib afio/prebuilt/lib/Release/ COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/Release/afio_dl-2.0-Windows-x64-Release.lib afio/prebuilt/lib/Release/ + COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/Release/ntkernel-error-category_dl.lib afio/prebuilt/lib/Release/ COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/bin/Release/afio_dl-2.0-Windows-x64-Release.dll afio/prebuilt/bin/Release/ - COMMAND "${CMAKE_COMMAND}" -E tar cfz afio_v2_binaries_win64.tar.gz afio + COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/bin/Release/ntkernel-error-category_dl.dll afio/prebuilt/bin/Release/ + COMMAND "${CMAKE_COMMAND}" -E tar cfz afio-v2.0-binaries-win64.tar.gz afio ) - get_filename_component(toupload afio_v2_binaries_win64.tar.gz ABSOLUTE) + get_filename_component(toupload afio-v2.0-binaries-win64.tar.gz ABSOLUTE) endif() else() if(EXISTS "prebuilt/lib/libafio_dl-2.0-Linux-x86_64-Release.so") @@ -42,9 +45,9 @@ else() COMMAND cp -a release_notes.md afio/ COMMAND cp -a --parents prebuilt/lib/libafio_sl-2.0-Linux-x86_64-Release.a afio/ COMMAND cp -a --parents prebuilt/lib/libafio_dl-2.0-Linux-x86_64-Release.so afio/ - COMMAND "${CMAKE_COMMAND}" -E tar cfz afio_v2_binaries_linux64.tgz afio + COMMAND "${CMAKE_COMMAND}" -E tar cfz afio-v2.0-binaries-linux64.tgz afio ) - get_filename_component(toupload afio_v2_binaries_linux64.tgz ABSOLUTE) + get_filename_component(toupload afio-v2.0-binaries-linux64.tgz ABSOLUTE) endif() endif() if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+")) diff --git a/.travis.yml b/.travis.yml index 0d39b115..6c5c6b9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,7 +102,10 @@ script: after_success: # - bash -x ./update_coveralls.sh `pwd` - NEWNAME=afio-v2.0-binaries-linux64-$(date +%Y%m%d%H%M).tgz - - mv afio_v2_binaries_linux64.tgz $NEWNAME + - mv afio-v2.0_binaries-linux64.tgz $NEWNAME - curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi4.nedprod.com/static/files/upload/ after_failure: + - NEWNAME=afio-v2.0-binaries-linux64-$(date +%Y%m%d%H%M).tgz + - mv afio-v2.0_binaries-linux64.tgz $NEWNAME + - curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi4.nedprod.com/static/files/upload/ diff --git a/appveyor.yml b/appveyor.yml index 00bb6184..dc7f9d4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,9 +31,11 @@ test_script: after_test: on_success: - - set "NEWNAME=afio-v2.0-binaries-win64-%date:~6,4%%date:~0,2%%date:~3,2%%time:~0,2%%time:~3,2%.tar.gz" - - rename afio_v2_binaries_win64.tar.gz "%NEWNAME" - - curl -T "%NEWNAME%" -u jenkins-nedprod:%JENKINS_NEDPROD_PASSWORD% https://dedi4.nedprod.com/static/files/upload/ on_failure: on_finish: + - dir prebuilt\bin\Release + - dir prebuilt\lib\Release + - set "NEWNAME=afio-v2.0-binaries-win64-%date:~6,4%%date:~0,2%%date:~3,2%%time:~0,2%%time:~3,2%.tar.gz" + - rename afio-v2.0-binaries-win64.tar.gz "%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)) |