match arch

Author: mckaymatt

.travis.yml

@@ -23,7 +23,7 @@ matrix:
     # we are using Rustup instead of cross when WHEELPLATFORM="*manylinux*". This is because both 
     # manylinux and Cross depend on Docker but the shared libs in the Cross contains are too new
     # to make valid manylinux containers. 
-    #
+    # 
     # You can lean more about the differnt Rustup toolchains here: 
     # https://github.com/rust-lang-nursery/rustup.rs#toolchain-specification
     # 
@@ -35,7 +35,7 @@ matrix:
     # cp27-cp27m, cp27-cp27mu, cp33-cp33m, cp34-cp34m, cp35-cp35m, cp36-cp36m
     # PYENV versions isn't relevent here so just keep it at 3.6.1 
     - env: TARGET=i686-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_i686
-    - env: TARGET=stable-x86_64-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_x86_64
+    - env: TARGET=x86_64-unknown-linux-gnu PYENV=3.6.1 WHEELPLATFORM=manylinux1_x86_64
 
     #  Note that musl isn't covered by manylinux and I had trouble building 
     #  dylibs with it as well

ci/install.sh

@@ -21,16 +21,16 @@ main() {
     fi
 
     # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
-                       | tail -n1)
+    # local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+    #                    | cut -d/ -f3 \
+    #                    | grep -E '^v[0.1.0-9.]+$' \
+    #                    | $sort --version-sort \
+    #                    | tail -n1)
     curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- \
            --force \
            --git japaric/cross \
-           --tag $tag \
+           --tag 'v0.1.10' \
            --target $target
 }
 

ci/manylinux_build_wheel.sh

@@ -21,8 +21,8 @@ function rust_build() {
     curl https://sh.rustup.rs -sSf > /tmp/rustup.sh
     sh /tmp/rustup.sh -y
     source $HOME/.cargo/env
-    rustup install "nightly-$TARGET"
-    rustup default "nightly-$TARGET"
+    rustup install "stable-$TARGET"
+    rustup default "stable-$TARGET"
     rustup update
 
     cd /io/trust_pypi_example/rust/

ci/script.sh

@@ -11,8 +11,9 @@ manylinux_linux() {
     CACHES="-v $HOME/.manylinux_pip_cache:/root/.cache/pip \
            -v $HOME/.manylinux_cargo_cache:/root/.cargo \
            -v $HOME/.manylinux_rustup_cache:/root/.rustup " 
-    # SUB='-v /home/matt/workspace/auditwheel/auditwheel/wheeltools.py:/opt/python/cp36-cp36m/lib/python3.6/site-packages/auditwheel/wheeltools.py'
-    docker run --rm -e TARGET="${TARGET}" $CACHES -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/ci/manylinux_build_wheel.sh
+
+    # WHEELPLATFORM is either "manylinux1_i686" or "manylinux1_x86_64"
+    docker run --rm -e TARGET="${TARGET}" $CACHES -v `pwd`:/io "quay.io/pypa/${WHEELPLATFORM}" /io/ci/manylinux_build_wheel.sh
 
 }