Recent CI changes have issues: revert them while fixing to unbreak CI (…

…onnx#583)

* Revert "temporarily disable python3 on osx for travis (onnx#579)"

This reverts commit 679d70e.

* Revert "osx travis support (onnx#566)"

This reverts commit 27b4022.

.travis.yml

@@ -1,49 +1,32 @@
-language: generic
-
-matrix:
-  include:
-    - os: linux
-      sudo: required
-      env: PYTHON_VERSION=python2
-    - os: linux
-      sudo: required
-      env: PYTHON_VERSION=python3
-    - os: osx
-      osx_image: xcode9.3beta
-      env: PYTHON_VERSION=python2
-    - os: linux
-      sudo: required
-      env: PYTHON_VERSION=python2 ONNX_ML=1
-    - os: linux
-      sudo: required
-      env: PYTHON_VERSION=python3 ONNX_ML=1
-    - os: osx
-      osx_image: xcode9.3beta
-      env: PYTHON_VERSION=python2 ONNX_ML=1
-
-env:
-  global:
-    - PB_VERSION=2.6.1
-
-before_install:
-  - ./.travis/before_install.sh
+os: linux
+dist: trusty
+sudo: required
+language: python
+python:
+  - "2.7"
+  - "3.6"
+
+addons:
+  apt:
+    packages:
+      - dos2unix
 
 install:
   - ./.travis/install.sh
 
 script:
-  - ./.travis/script.sh
-
-after_success:
-  - ./.travis/after_success.sh
-
-after_failure:
-  - ./.travis/after_failure.sh
+  - ./.travis/build.sh
 
 cache:
-  - timeout: 300
   - directories:
-    - $BUILD_CCACHE_DIR
-    - $BUILD_NINJA_DIR
+    - $HOME/.build_cache
     - $HOME/.ccache
-    - $HOME/.cache/pb
+
+env:
+  global:
+    - PB_VERSION=2.6.1
+  matrix:
+    - USE_NINJA=false
+    - USE_NINJA=true
+    - ONNX_ML=1 USE_NINJA=false
+    - ONNX_ML=1 USE_NINJA=true

.travis/script.sh → .travis/build.sh

@@ -1,10 +1,16 @@
 #!/bin/bash
 
-script_path=$(python -c "import os; import sys; print(os.path.realpath(sys.argv[1]))" "${BASH_SOURCE[0]}")
-source "${script_path%/*}/setup.sh"
+scripts_dir=$(dirname $(readlink -e "${BASH_SOURCE[0]}"))
+source "$scripts_dir/common";
 
 onnx_dir="$PWD"
 
+# install onnx
+cd $onnx_dir
+ccache -z
+ONNX_NAMESPACE=ONNX_NAMESPACE_FOO_BAR_FOR_CI pip install -v .
+ccache -s
+
 # onnx tests
 cd $onnx_dir
 pip install pytest-cov nbval

.travis/common

@@ -0,0 +1,14 @@
+set -ex
+
+die() {
+    echo >&2 "$@"
+    exit 1
+}
+
+workdir="$HOME/work"
+mkdir -p "$workdir"
+build_cache_dir="$HOME/.build_cache/pb-$PB_VERSION"
+mkdir -p "$build_cache_dir"
+
+# setup ccache
+export PATH="/usr/lib/ccache:$PATH"

.travis/install.sh

@@ -1,6 +1,17 @@
 #!/bin/bash
 
-script_path=$(python -c "import os; import sys; print(os.path.realpath(sys.argv[1]))" "${BASH_SOURCE[0]}")
-source "${script_path%/*}/setup.sh"
+scripts_dir=$(dirname $(readlink -e "${BASH_SOURCE[0]}"))
+source "$scripts_dir/common"
 
-time ONNX_NAMESPACE=ONNX_NAMESPACE_FOO_BAR_FOR_CI pip install -v .
+# install protobuf
+pb_dir="$build_cache_dir/pb"
+mkdir -p $pb_dir
+wget -qO- "https://github.com/google/protobuf/releases/download/v$PB_VERSION/protobuf-$PB_VERSION.tar.gz" | tar -xvz -C "$pb_dir" --strip-components 1
+ccache -z
+cd "$pb_dir" && ./configure && make && make check && sudo make install && sudo ldconfig
+ccache -s
+
+
+if [[ $USE_NINJA == true ]]; then
+    pip install ninja
+fi