Try yet again to fix binary uploads #60

4 files changed, 21 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 5f0ce404..0e7d0e5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -231,16 +231,17 @@ script:
    fi
  
 after_success:
-  - export NAME=$TRAVIS_OSNAME_$TRAVIS_COMPILER_$NAME
+  - echo $TRAVIS_OSNAME
+  - echo $TRAVIS_COMPILER
   - echo $NAME
 # - bash -x ./update_coveralls.sh `pwd`
 #  - NEWNAME=llfio-v2-binaries-linux64-$(date +%Y%m%d%H%M%S).tgz
-  - if [ "$NAME" = "linux_g++_x64_EC_tests" ]; then   
+  - if [ "$TRAVIS_OSNAME" = "linux" ] && [ "$TRAVIS_COMPILER" = "g++" ] && [ "$NAME" = "x64_EC_tests" ]; then   
       NEWNAME=llfio-v2-binaries-linux64-$TRAVIS_COMMIT.tgz;
       mv llfio-v2.0-binaries-linux-x64.tgz $NEWNAME;
       curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/;
     fi
-  - if [ "$NAME" = "osx_clang++_x64_EC_tests" ]; then   
+  - if [ "$TRAVIS_OSNAME" = "osx" ] && [ "$NAME" = "x64_EC_tests" ]; then   
       NEWNAME=llfio-v2-binaries-darwin64-$TRAVIS_COMMIT.tgz;
       mv llfio-v2.0-binaries-darwin-x64.tgz $NEWNAME;
       curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/;
diff --git a/Build.md b/Build.md
index 432fc952..6325a75e 100644
--- a/Build.md
+++ b/Build.md
@@ -2,11 +2,10 @@
 
 These compilers and OSs are regularly tested:
 
-- [GCC](https://gcc.gnu.org/) 7.4 (Linux 4.x x64)
-- [Clang](https://clang.llvm.org/) 4.0 (Linux 4.x x64)
-- Clang 5.0 (macOS 10.12 x64)
-- Visual Studio 2017 (Windows 10 x64). Note that LLFIO does not currently
-compile with `/permissive-` due a bug in MSVC.
+- [GCC](https://gcc.gnu.org/) 7.5 (Linux 4.x x64)
+- [Clang](https://clang.llvm.org/) 7 (Linux 4.x x64)
+- Xcode 11.6 (macOS 10.15 x64)
+- Visual Studio 2017 (Windows 10 x64).
 
 Other compilers, architectures and OSs may work, but are not tested regularly.
 You will need a working [Filesystem TS](https://en.cppreference.com/w/cpp/experimental/fs)
@@ -14,7 +13,7 @@ implementation in your STL, and at least C++ 14.
 
 ## Get a copy of the source
 
-Download [this archive](https://dedi5.nedprod.com/static/files/llfio-v2.0-source-latest.tar.xz)
+Download [this archive](https://dedi5.nedprod.com/static/files/llfio-v2-source-latest.tar.xz)
 or clone from the GitHub repository:
 
 ~~~
@@ -73,8 +72,9 @@ Don't use header only LLFIO on Windows (see below).
 It is faster to build programs using LLFIO if you don't use a header only build.
 In this situation, define `LLFIO_HEADERS_ONLY=0`, and choose one of `LLFIO_DYN_LINK` or `LLFIO_STATIC_LINK` depending on whether you are using the prebuilt shared or static libraries respectively.
 
-- https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-linux64-latest.tgz
-- https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-win64-latest.zip
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-darwin-latest.zip
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-linux64-latest.tgz
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-win64-latest.zip
 
 ## Build static libraries from source
 
diff --git a/Readme.md b/Readme.md
index a30eaa65..62267be3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -3,10 +3,10 @@ This is the post-peer-review LLFIO v2 rewrite. You can view its documentation at
 <b>master branch test status</b> Linux & OS X: [![Build Status](https://travis-ci.org/ned14/llfio.svg?branch=master)](https://travis-ci.org/ned14/llfio) Windows: [![Build status](https://ci.appveyor.com/api/projects/status/dfctqfap3kpx89om/branch/master?svg=true)](https://ci.appveyor.com/project/ned14/llfio/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://dedi5.nedprod.com/static/files/llfio-v2.0-source-latest.tar.xz
-- https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-linux64-latest.tgz (Ubuntu 18.04 LTS x64)
-- https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-darwin64-latest.tgz (Mac OS 10.15)
-- https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-win64-latest.zip (VS2017 x64)
+- https://dedi5.nedprod.com/static/files/llfio-v2-source-latest.tar.xz
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-linux64-latest.tgz (Ubuntu 18.04 LTS x64)
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-darwin64-latest.tgz (Mac OS 10.15)
+- https://dedi5.nedprod.com/static/files/llfio-v2-binaries-win64-latest.zip (VS2017 x64)
 
 USAGE AND CONFIGURATION INSTRUCTIONS CAN BE FOUND AT https://ned14.github.io/llfio/
 
@@ -129,7 +129,7 @@ compress the additional 4Kb very quickly using the dictionary from the 1Mb.
     - LATER: Use guard pages to toggle dirty flag per initial COW
 - [ ] Store in EA or a file called .spookyhashes or .spookyhash the 128 bit hash of
 a file and the time it was calculated. This can save lots of hashing work later.
-- [ ] Correct directory hierarchy delete
+- [x] Correct directory hierarchy delete
   i.e.:
   - Delete files first tips to trunk, retrying for some given timeout. If fail to
   immediately delete, rename to base directory under a long random hex name, try
diff --git a/release_notes.md b/release_notes.md
index 16734450..55399f40 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/llfio">Linux and MacOS CI:</a><img src="https://travis-ci.org/ned14/llfio.svg?branch=master"/> </td>
 <td align="center"> <a href="https://ci.appveyor.com/project/ned14/llfio/branch/master">Windows CI:</a><img src="https://ci.appveyor.com/api/projects/status/dfctqfap3kpx89om/branch/master?svg=true"/> </td>
-<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-source-latest.tar.xz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-source-latest.tar.xz">sources</a> </td>
-<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-linux64-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-linux64-latest.tgz">Ubuntu 18.04 x64 prebuilt</a> </td>
-<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-darwin-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-darwin64-latest.tgz">OS X x64 prebuilt</a> </td>
-<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-win64-latest.zip">Latest stable</a><br/><a href="https://dedi5.nedprod.com/static/files/llfio-v2.0-binaries-win64-latest.zip">VS2017 x64 prebuilt</a> </td>
+<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2-source-latest.tar.xz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2-source-latest.tar.xz">sources</a> </td>
+<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-linux64-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-linux64-latest.tgz">Ubuntu 18.04 x64 prebuilt</a> </td>
+<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-darwin-latest.tgz">Latest stable</a><br><a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-darwin64-latest.tgz">OS X x64 prebuilt</a> </td>
+<td align="center"> <a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-win64-latest.zip">Latest stable</a><br/><a href="https://dedi5.nedprod.com/static/files/llfio-v2-binaries-win64-latest.zip">VS2017 x64 prebuilt</a> </td>
 </tr>
 </table></center>