don't build osx 2

bluzelle · Sep 4, 2019 · 8a4e39c · 8a4e39c
1 parent 94a96a0
commit 8a4e39c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,27 +45,23 @@ before_install:
     - eval "${MATRIX_EVAL}"
     - mkdir -p $HOME/.local
     - |
-      if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-        pip install --user cpp-coveralls
-        if [ ! -e $HOME/.local/bin/cmake ]; then
-          echo "CMake not found in the cache, get and extract it..."
-          travis_retry curl -L ${CMAKE_URL} \
-            | tar -xz -C $HOME/.local --strip-components=1
-        else
-          echo "Using cached CMake"
-        fi
+      pip install --user cpp-coveralls
+      if [ ! -e $HOME/.local/bin/cmake ]; then
+        echo "CMake not found in the cache, get and extract it..."
+        travis_retry curl -L ${CMAKE_URL} \
+          | tar -xz -C $HOME/.local --strip-components=1
+      else
+        echo "Using cached CMake"
       fi
     - |
-      if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-        if [ ! -e $HOME/pmd-bin-6.6.0/bin/run.sh ]; then
-          echo "PMD not found in the cache, get and extract it..."
-          cd $HOME
-          travis_retry curl -OL "https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.6.0/pmd-bin-6.6.0.zip"
-          unzip pmd-bin-6.6.0.zip
-          rm pmd-bin-6.6.0.zip
-        else
-          echo "Using cached PMD"
-        fi
+      if [ ! -e $HOME/pmd-bin-6.6.0/bin/run.sh ]; then
+        echo "PMD not found in the cache, get and extract it..."
+        cd $HOME
+        travis_retry curl -OL "https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.6.0/pmd-bin-6.6.0.zip"
+        unzip pmd-bin-6.6.0.zip
+        rm pmd-bin-6.6.0.zip
+      else
+        echo "Using cached PMD"
       fi
 
 compiler:
@@ -93,25 +89,12 @@ script:
   - make package
 
 after_success:
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      coveralls -r ${TRAVIS_BUILD_DIR} -e 'build/boost' -e 'build/openssl' -e 'build/rocksdb' -e 'build/jsoncpp' -e 'build/googletest' -e 'build/proto' -e 'build/CMakeFiles' -e 'build/swarm_version.hpp' -e 'audit/test' -e 'bootstrap/test' -e 'chaos/test' -e 'crud/test' -e 'crypto/test' -e 'ethereum/test' -e 'http/test' -e 'mocks' -e 'node/test' -e 'options/test' -e 'pbft/test' -e 'status/test' -e 'storage/test' -e 'swarm' -e 'include' -e 'utils/test' --gcov-options '\-lp'
-    fi
+  - coveralls -r ${TRAVIS_BUILD_DIR} -e 'build/boost' -e 'build/openssl' -e 'build/rocksdb' -e 'build/jsoncpp' -e 'build/googletest' -e 'build/proto' -e 'build/CMakeFiles' -e 'build/swarm_version.hpp' -e 'audit/test' -e 'bootstrap/test' -e 'chaos/test' -e 'crud/test' -e 'crypto/test' -e 'ethereum/test' -e 'http/test' -e 'mocks' -e 'node/test' -e 'options/test' -e 'pbft/test' -e 'status/test' -e 'storage/test' -e 'swarm' -e 'include' -e 'utils/test' --gcov-options '\-lp'
   - echo ${TRAVIS_BRANCH}
   - if [ "$TRAVIS_BRANCH" = "master" ] ; then PACKAGE_COMPONENT="stable" ; else PACKAGE_COMPONENT="unstable" ; fi
   - |
     if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "devel" ] || [[ $TRAVIS_BRANCH == *"release"* ]]; then
-      if [ "$TRAVIS_OS_NAME" = "linux"  ]; then
-        travis_retry curl -u${REPO_USER}:${REPO_PASSWORD} -XPUT "https://bluzelle.jfrog.io/bluzelle/debian-local/pool/${PACKAGE_NAME_DEB};deb.distribution=all;deb.component=${PACKAGE_COMPONENT};deb.architecture=${PACKAGE_ARCHITECTURE}" -T ${TRAVIS_BUILD_DIR}/build/${PACKAGE_NAME_DEB}
-      fi
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        if [ "$TRAVIS_BRANCH" = "master" ]; then
-          travis_retry curl -u${REPO_USER}:${REPO_PASSWORD} -T ${TRAVIS_BUILD_DIR}/build/${PACKAGE_NAME_OSX} "https://bluzelle.jfrog.io/bluzelle/OSX/${PACKAGE_NAME_OSX}"
-        fi
-        if [ "$TRAVIS_BRANCH" = "devel" ]; then
-          travis_retry curl -u${REPO_USER}:${REPO_PASSWORD} -T ${TRAVIS_BUILD_DIR}/build/${PACKAGE_NAME_OSX} "https://bluzelle.jfrog.io/bluzelle/osx-dev/${PACKAGE_COMPONENT}-${PACKAGE_NAME_OSX}"
-        fi
-      fi
+      travis_retry curl -u${REPO_USER}:${REPO_PASSWORD} -XPUT "https://bluzelle.jfrog.io/bluzelle/debian-local/pool/${PACKAGE_NAME_DEB};deb.distribution=all;deb.component=${PACKAGE_COMPONENT};deb.architecture=${PACKAGE_ARCHITECTURE}" -T ${TRAVIS_BUILD_DIR}/build/${PACKAGE_NAME_DEB}
     fi
     if [ "$TRAVIS_BRANCH" = "master" ] ; then
       git lfs fetch --all

diff --git a/README.md b/README.md
@@ -23,22 +23,6 @@ If you want to deploy your swarm immediately you can use our docker-compose quic
 
 ## Getting started building from source
 
-### Installation - macOSX
-
-**Dependencies \(Protobuf, CMake\)**
-
-```text
-$ brew install protobuf openssl snappy lz4 git-lfs
-```
-
-**ccache \(Optional\)**
-
-If available, cmake will attempt to use ccache \([https://ccache.samba.org](https://ccache.samba.org)\) to _drastically_ speed up compilation.
-
-```text
-$ brew install ccache
-```
-
 ### Installation - Ubuntu
 
 **CMake (Ver. 3.10 or greater) etc.**