nix-rust · asomers · Feb 25, 2017 · Feb 25, 2017 · Feb 25, 2017 · Feb 25, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -1,102 +1,116 @@
-#
-# Operating Environment
-#
-language: rust
-sudo: false
+# Based on the "trust" template v0.1.1
+# https://github.com/japaric/trust/tree/v0.1.1
+
 dist: trusty
-services:
-  - docker
-addons:
-  apt:
-    packages:
-      - gcc-multilib
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - binutils-dev
-
-rust:
-  - 1.7.0  # Oldest supported version
-  - stable
-  - beta
-  - nightly
-
-#
-# Environment Variables and Build Matrix
-#
+language: rust
+services: docker
+sudo: required
+
+# This is the Rust channel that build jobs will use by default but can be
+# overridden on a case by case basis down below
+rust: 1.13.0
+
 env:
   global:
-    - PATH=$HOME/.local/bin:$PATH
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=""
-  matrix:
-    - ARCH=x86_64
-    - ARCH=i686
+    - CRATE_NAME=nix
+    - CARGO_TEST_THREADS=1
 
-os:  # OSX included in build matrix explicitly
-  - linux
+    # default job
+    - TARGET=x86_64-unknown-linux-gnu
 
-# Failures on nightly shouldn't fail the overall build.
 matrix:
-  fast_finish: true
+  # These are all the build jobs. Adjust as necessary. Comment out what you
+  # don't need
   include:
-    # 32-bit and 64-bit OSX builds on oldest/stable
-    - os: osx
-      env: ARCH=x86_64
-      rust: stable
-    - os: osx
-      env: ARCH=i686
-      rust: stable
-    # Docker builds for other targets
-    - os: linux
-      env: TARGET=aarch64-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:arm
-      rust: 1.7.0
-      sudo: true
-    - os: linux
-      env: TARGET=arm-unknown-linux-gnueabihf DOCKER_IMAGE=posborne/rust-cross:arm
-      rust: 1.7.0
-      sudo: true
-    - os: linux
-      env: TARGET=mips-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
-      rust: 1.7.0
-      sudo: true
-    - os: linux
-      env: TARGET=mipsel-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
-      rust: 1.7.0
-      sudo: true
-    - os: linux
-      env: TARGET=arm-linux-androideabi DOCKER_IMAGE=posborne/rust-cross:android
-      rust: 1.7.0
-      sudo: true
-  allow_failures:
-    - rust: nightly
-    # We need to upgrade the lowest supported version. However, the build
-    # infrastructure for arm/mips/android is not ready yet.
-    - rust: 1.7.0
-    - env: TARGET=mips-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
-    - env: TARGET=mipsel-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
-    - env: TARGET=arm-linux-androideabi DOCKER_IMAGE=posborne/rust-cross:android
+    # Linux
+    - env: TARGET=i686-unknown-linux-gnu
+    - env: TARGET=i686-unknown-linux-musl
+    # - env: TARGET=x86_64-unknown-linux-gnu  # this is the default job
+    - env: TARGET=x86_64-unknown-linux-musl
+
+    # OSX
+    - env: TARGET=i686-apple-darwin
+      os: osx
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+
+    # *BSD
+    - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
+    - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
+    - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
 
+    # Other architectures
+    - env: TARGET=aarch64-unknown-linux-gnu
+    - env: TARGET=armv7-unknown-linux-gnueabihf
+    - env: TARGET=mips-unknown-linux-gnu
+    # - env: TARGET=mips64-unknown-linux-gnuabi64
+    # - env: TARGET=mips64el-unknown-linux-gnuabi64
+    - env: TARGET=mipsel-unknown-linux-gnu
+    - env: TARGET=powerpc-unknown-linux-gnu
+    # - env: TARGET=powerpc64-unknown-linux-gnu
+    # - env: TARGET=powerpc64le-unknown-linux-gnu
+    # - env: TARGET=s390x-unknown-linux-gnu
+    - env: TARGET=arm-unknown-linux-gnueabi
+    # - env: TARGET=arm-unknown-linux-musleabi
 
-#
-# Build/Test/Deploy Steps
-#
-before_script:
-  - pip install 'travis-cargo<0.2' --user
+    # Testing beta on main targets
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: beta
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: beta
+
+  # Testing nightlies on main targets. These might fail because of issues
+  # with the compiler, so we allow failures here.
+  allow_failures:
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
+
+install:
+  - sh ci/install.sh
+  - source ~/.cargo/env || true
 
 script:
-  - bash ci/run-travis.sh
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-        travis-cargo --only stable doc
-    fi
-
-after_success:
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && \
-       [ "$TRAVIS_RUST_VERSION" = "stable" ] && \
-       [ "$ARCH" = "x86_64" ]; then
-        # Upload docs for stable (on master) to gh-pages
-        travis-cargo --only stable doc-upload
-        # Measure code coverage using kcov and upload to coveralls.io
-        travis-cargo coveralls --no-sudo --verify
-    fi
+  - bash ci/script.sh
+
+before_deploy:
+  - sh ci/before_deploy.sh
+
+deploy:
+  # TODO update `api_key.secure`
+  # - Create a `public_repo` GitHub token. Go to: https://github.com/settings/tokens/new
+  # - Encrypt it: `travis encrypt GH_TOKEN=0123456789012345678901234567890123456789`
+  # - Paste the output down here
+  api_key:
+    secure: S1ktt0eqmfrEHnYPf4WO7mZtatz/FWfYWBp8nwdc0nd8H6UNZ9Dwy3tJpVe0N9rpB9vAFnkdw6R4jdkIcgxfory2F3F8k/mh8cWn0mkvh2N34YjHMYLnuVzOoFrWai7IcPfROpdlY0tGBlwNj5KMkeBnHUJzd2q4j/4j/tlrfmg=
+  file_glob: true
+  file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
+  on:
+    # Here you can pick which targets will generate binary releases
+    # In this example, there are some targets that are tested using the stable
+    # and nightly channels. This condition makes sure there is only one release
+    # for such targets and that's generated using the stable channel
+    #
+    # Here we make it so we never generate binary releases
+    condition: $DEPLOY = never
+    tags: true
+  provider: releases
+  skip_cleanup: true
+
+cache: cargo
+before_cache:
+  # Travis can't cache files that are not readable by "others"
+  - chmod -R a+r $HOME/.cargo
+
+branches:
+  only:
+    # release tags
+    - /^v\d+\.\d+\.\d+.*$/
+    - master
+
+notifications:
+  email:
+    on_success: never
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -112,6 +112,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#542](https://github.com/nix-rust/nix/pull/542)
 
 ### Fixed
+- Fixed multiple issues compiling under different archetectures and OSes.
+  Now compiles on Linux/MIPS ([#538](https://github.com/nix-rust/nix/pull/538)),
+  `Linux/PPC` ([#553](https://github.com/nix-rust/nix/pull/553)), 
+  `MacOS/x86_64,i686` ([#553](https://github.com/nix-rust/nix/pull/553),
+  and `NetBSD/x64_64` ([#538](https://github.com/nix-rust/nix/pull/538).
 - Fixed multiple issues with Unix domain sockets on non-Linux OSes
   ([#474](https://github.com/nix-rust/nix/pull/415))
 - Fixed using kqueue with `EVFILT_USER` on FreeBSD

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ pub fn gethostname(name: &mut [u8]) -> Result<()>;
 ```
 
 ## Requirements
-Rust >= 1.9.0
+Rust >= 1.13.0
 
 ## Usage
 

diff --git a/ci/README.md b/ci/README.md
diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1
@@ -0,0 +1,23 @@
+# This script takes care of packaging the build artifacts that will go in the
+# release zipfile
+
+$SRC_DIR = $PWD.Path
+$STAGE = [System.Guid]::NewGuid().ToString()
+
+Set-Location $ENV:Temp
+New-Item -Type Directory -Name $STAGE
+Set-Location $STAGE
+
+$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"
+
+# TODO Update this to package the right artifacts
+Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\hello.exe" '.\'
+
+7z a "$ZIP" *
+
+Push-AppveyorArtifact "$ZIP"
+
+Remove-Item *.* -Force
+Set-Location ..
+Remove-Item $STAGE
+Set-Location $SRC_DIR
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
@@ -0,0 +1,33 @@
+# This script takes care of building your crate and packaging it for release
+
+set -ex
+
+main() {
+    local src=$(pwd) \
+          stage=
+
+    case $TRAVIS_OS_NAME in
+        linux)
+            stage=$(mktemp -d)
+            ;;
+        osx)
+            stage=$(mktemp -d -t tmp)
+            ;;
+    esac
+
+    test -f Cargo.lock || cargo generate-lockfile
+
+    # TODO Update this to build the artifacts that matter to you
+    cross rustc --bin hello --target $TARGET --release -- -C lto
+
+    # TODO Update this to package the right artifacts
+    cp target/$TARGET/release/hello $stage/
+
+    cd $stage
+    tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
+    cd $src
+
+    rm -rf $stage
+}
+
+main
diff --git a/ci/cargo-config b/ci/cargo-config
diff --git a/ci/install.sh b/ci/install.sh
@@ -0,0 +1,24 @@
+set -ex
+
+main() {
+    curl https://sh.rustup.rs -sSf | \
+        sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION
+
+    local target=
+    if [ $TRAVIS_OS_NAME = linux ]; then
+        target=x86_64-unknown-linux-gnu
+    else
+        target=x86_64-apple-darwin
+    fi
+
+    # TODO At some point you'll probably want to use a newer release of `cross`,
+    # simply change the argument to `--tag`.
+    curl -LSfs https://japaric.github.io/trust/install.sh | \
+        sh -s -- \
+           --force \
+           --git japaric/cross \
+           --tag v0.1.4 \
+           --target $target
+}
+
+main