Merge pull request #18 from wschin/linux-back

Bring linux builds back
onnx · Sep 27, 2019 · 8c95e62 · 8c95e62
2 parents eaaa878 + 318fe34
commit 8c95e62
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,12 +18,12 @@ dist: trusty
 services: docker
 # Force xcode 6.4 image to work round
 # https://github.com/python-pillow/pillow-wheels/issues/45
-osx_image: xcode9.3beta
-
+# So we have the line below for OSX builds
+# osx_image: xcode9.3beta
 matrix:
+  # Exclude the default Python 3.5 build
   exclude:
-    # Exclude the default Python 3.5 build
-    - python: 3.5
+  - python: 3.5
   include:
   - os: osx
     language: generic
@@ -33,7 +33,6 @@ matrix:
       - MB_PYTHON_VERSION=3.5
       - ONNX_ML=1
       - MACOSX_DEPLOYMENT_TARGET=10.9
-
   - os: osx
     language: generic
     sudo: required
@@ -42,7 +41,6 @@ matrix:
       - MB_PYTHON_VERSION=3.6
       - ONNX_ML=1
       - MACOSX_DEPLOYMENT_TARGET=10.9
-
   - os: osx
     language: generic
     sudo: required
@@ -51,7 +49,6 @@ matrix:
       - MB_PYTHON_VERSION=3.7
       - ONNX_ML=1
       - MACOSX_DEPLOYMENT_TARGET=10.9
-
   - os: osx
     language: generic
     sudo: required
@@ -60,6 +57,63 @@ matrix:
       - MB_PYTHON_VERSION=2.7
       - ONNX_ML=1
       - MACOSX_DEPLOYMENT_TARGET=10.9
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=2.7 
+      - ONNX_ML=1 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=2.7 
+      - ONNX_ML=1 
+      - UNICODE_WIDTH=16 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=2.7 
+      - ONNX_ML=1 
+      - PLAT=i686 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=2.7 
+      - ONNX_ML=1 
+      - UNICODE_WIDTH=16 
+      - PLAT=i686 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.5 
+      - ONNX_ML=1 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.6 
+      - ONNX_ML=1 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.7 
+      - ONNX_ML=1 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.5 
+      - ONNX_ML=1 
+      - PLAT=i686 
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.6 
+      - ONNX_ML=1 
+      - PLAT=i686
+  - os: linux 
+    sudo: required 
+    env: 
+      - MB_PYTHON_VERSION=3.7 
+      - ONNX_ML=1 
+      - PLAT=i686
 
 before_install:
   - source multibuild/common_utils.sh;

diff --git a/config.sh b/config.sh
@@ -38,8 +38,8 @@ function build_libs {
     if [ -z "$IS_OSX" ]; then
        cmake_dir="${wkdir_path}/cmake"
        mkdir -p "$cmake_dir"
-       curl -L -O https://cmake.org/files/v3.1/cmake-3.1.2.tar.gz
-       tar -xzf cmake-3.1.2.tar.gz -C "$cmake_dir" --strip-components 1
+       curl -L -O https://cmake.org/files/v3.3/cmake-3.3.2.tar.gz
+       tar -xzf cmake-3.3.2.tar.gz -C "$cmake_dir" --strip-components 1
        cd ${cmake_dir} && ls ${cmake_dir}
        ./configure --prefix=${cmake_dir}/build
        make -j${NUMCORES} && make install
@@ -59,4 +59,4 @@ function run_tests {
     pip install tornado==4.5.3
     pip install pytest-cov nbval
     pytest
-}
+}