ensure failed publish actually fails [publish binary]

Dane Springmeyer · Dane Springmeyer · commit c4ead2c3a141 · 2017-03-02T19:59:26.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -29,9 +29,7 @@ install:
 # run tests
 script:
   - npm test
-
-# after successful tests, publish binaries if specified in commit message
-after_script_default: &publish
+  # after successful tests, publish binaries if specified in commit message
   - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
 
 # the matrix allows you to specify different operating systems and environments to 
@@ -42,38 +40,33 @@ matrix:
     - os: linux
       env: BUILDTYPE=release
       node_js: 4
-      after_script: *publish
     # linux publishable node v4/debug
     - os: linux
       env: BUILDTYPE=debug
       node_js: 4
-      after_script: *publish
     # linux publishable node v6
     - os: linux
       env: BUILDTYPE=release
       node_js: 6
-      after_script: *publish
     # linux publishable node v6/debug
     - os: linux
       env: BUILDTYPE=debug
       node_js: 6
-      after_script: *publish
     # osx publishable node v4
     - os: osx
       osx_image: xcode8.2
       env: BUILDTYPE=release
       node_js: 4
-      after_script: *publish
     # osx publishable node v6
     - os: osx
       osx_image: xcode8.2
       env: BUILDTYPE=release
       node_js: 6
-      after_script: *publish
     # Sanitizer build node v4/Debug
     - os: linux
       env: BUILDTYPE=debug TOOLSET=asan
       node_js: 4
+      # Overrides `install` to set up custom asan flags
       install:
         - ./scripts/setup.sh --config local.env
         # put mason and clang++ on PATH
@@ -83,19 +76,21 @@ matrix:
         - export CXXFLAGS="${MASON_SANITIZE_CXXFLAGS} -fno-sanitize-recover=all"
         - export LDFLAGS="${MASON_SANITIZE_LDFLAGS}"
         - make ${BUILDTYPE}
+      # Overrides `script` to disable asan LD_PRELOAD before publishing
       script:
         - export LD_PRELOAD=${MASON_LLVM_RT_PRELOAD}
         - export ASAN_OPTIONS=fast_unwind_on_malloc=0:${ASAN_OPTIONS}
-        - export CXXFLAGS="${CXXFLAGS} -fno-sanitize-recover=all"
-        - make ${BUILDTYPE}
-        - export LD_PRELOAD=${MASON_LLVM_RT_PRELOAD}
         - npm test
-      after_script: *publish
+        - unset LD_PRELOAD
+        # after successful tests, publish binaries if specified in commit message
+        - ./scripts/publish.sh --toolset=${TOOLSET:-} --debug=$([ "${BUILDTYPE}" == 'debug' ] && echo "true" || echo "false")
     # Coverage build
     - os: linux
       env: BUILDTYPE=debug CXXFLAGS="--coverage" LDFLAGS="--coverage"
       node_js: 4
-      after_script:
+      # Overrides `script` to publish coverage data to codecov
+      script:
+        - npm test
         - mason install llvm-cov ${MASON_LLVM_RELEASE}
         - mason link llvm-cov ${MASON_LLVM_RELEASE}
         - which llvm-cov
