diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | Readme.md | 8 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | release_notes.md | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index e51ac660..10bd020a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,7 @@ before_install: script: - - if [ "$__" = "cmake tests" ]; then + if [ "$__" = "cmake tests (error_code)" || "$__" = "cmake tests (status_code)" ]; then ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ; fi - @@ -118,15 +118,15 @@ script: after_success: # - bash -x ./update_coveralls.sh `pwd` # - NEWNAME=afio-v2.0-binaries-linux64-$(date +%Y%m%d%H%M%S).tgz - - if [ "${TRAVIS_OS_NAME}" = "linux" && "$CXX" = "clang++-4.0" ]; then + - if [ "${TRAVIS_OS_NAME}" = "linux" && "$CXX" = "clang++-4.0" && "$__" = "cmake tests (error_code)" ]; then NEWNAME=afio-v2.0-binaries-linux64-$TRAVIS_COMMIT.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/; fi; + curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/; fi; fi - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then NEWNAME=afio-v2.0-binaries-darwin64-$TRAVIS_COMMIT.tgz; mv afio-v2.0-binaries-darwin64.tgz $NEWNAME; - curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi4.nedprod.com/static/files/upload/; fi; + curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/; fi; fi after_failure: @@ -3,10 +3,10 @@ This is the post-peer-review AFIO v2 rewrite. You can view its documentation at <b>master branch test status</b> Linux & OS X: [](https://travis-ci.org/ned14/afio) Windows: [](https://ci.appveyor.com/project/ned14/afio/branch/master) <b>CMake dashboard</b>: http://my.cdash.org/index.php?project=Boost.AFIO Tarballs of source and prebuilt binaries for Linux x64, MacOS x64 and Windows x64: -- https://dedi4.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz -- https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz -- https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-darwin64-latest.tgz -- https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip +- https://dedi5.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz +- https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz +- https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-darwin64-latest.tgz +- https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip ### Immediate todos in order of priority: diff --git a/appveyor.yml b/appveyor.yml index 70040385..fad7da02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,7 @@ on_success: # - 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/ + - curl -T %NEWNAME% -u jenkins-nedprod:%JENKINS_NEDPROD_PASSWORD% https://dedi5.nedprod.com/static/files/upload/ on_failure: on_finish: - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path prebuilt\merged_junit_results.xml)) diff --git a/release_notes.md b/release_notes.md index 08669382..b8cc8c70 100644 --- a/release_notes.md +++ b/release_notes.md @@ -4,10 +4,10 @@ <td align="center"> <a href="http://my.cdash.org/index.php?project=Boost.AFIO">CTest summary</a><br><a href="http://my.cdash.org/index.php?project=Boost.AFIO">dashboard</a> </td> <td align="center"> <a href="https://travis-ci.org/ned14/afio">Linux and MacOS CI:</a><img src="https://travis-ci.org/ned14/afio.svg?branch=master"/> </td> <td align="center"> <a href="https://ci.appveyor.com/project/ned14/afio/branch/master">Windows CI:</a><img src="https://ci.appveyor.com/api/projects/status/680b1pt9srnoprs3/branch/master?svg=true"/> </td> -<td align="center"> <a href="https://dedi4.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz">Latest stable</a><br><a href="https://dedi4.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz">sources</a> </td> -<td align="center"> <a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz">Latest stable</a><br><a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz">Linux x64 prebuilt</a> </td> -<td align="center"> <a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-darwin-latest.tgz">Latest stable</a><br><a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-darwin64-latest.tgz">OS X x64 prebuilt</a> </td> -<td align="center"> <a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip">Latest stable</a><br/><a href="https://dedi4.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip">VS2017 x64 prebuilt</a> </td> +<td align="center"> <a href="https://dedi5.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/afio-v2.0-source-latest.tar.xz">sources</a> </td> +<td align="center"> <a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-linux64-latest.tgz">Linux x64 prebuilt</a> </td> +<td align="center"> <a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-darwin-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-darwin64-latest.tgz">OS X x64 prebuilt</a> </td> +<td align="center"> <a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip">Latest stable</a><br/><a href="https://dedi5.nedprod.com/static/files/afio-v2.0-binaries-win64-latest.zip">VS2017 x64 prebuilt</a> </td> </tr> </table></center> |