Skip to content

Commit

Permalink
Merge pull request #45 from japaric/bsd
Browse files Browse the repository at this point in the history
*BSD support
  • Loading branch information
Jorge Aparicio authored Jan 8, 2017
2 parents d359cb8 + 1f5e996 commit ac4bc1b
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 14 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ env:
# TODO Update this to match the name of your project.
- CRATE_NAME=trust

# TODO This is the channel that will be used to produce binary releases
- DEPLOY_VERSION=stable

# default job
- TARGET=x86_64-unknown-linux-gnu

Expand All @@ -34,6 +31,11 @@ matrix:
- 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
Expand Down Expand Up @@ -73,7 +75,11 @@ deploy:
file_glob: true
file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
on:
condition: $TRAVIS_RUST_VERSION = $DEPLOY_VERSION
# TODO 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
condition: $TRAVIS_RUST_VERSION = stable
tags: true
provider: releases
skip_cleanup: true
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ would

- `x86_64-apple-darwin`

### *BSD

- `i686-unknown-freebsd`

- `x86_64-unknown-freebsd`

- `x86_64-unknown-netbsd`

### Windows (MinGW)

- `i686-pc-windows-gnu`
Expand Down
5 changes: 4 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ deploy:
secure: t3puM/2hOig26EHhAodcZBc61NywF7/PFEpimR6SwGaCiqS07KR5i7iAhSABmBp7
description: ''
on:
# TODO This is the channel that will be used to produce binary releases
# TODO 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
RUST_VERSION: stable
appveyor_repo_tag: true
provider: GitHub
Expand Down
2 changes: 1 addition & 1 deletion ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ main() {
sh -s -- \
--force \
--git japaric/cross \
--tag v0.1.3 \
--tag v0.1.4 \
--target $target
}

Expand Down
16 changes: 8 additions & 8 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ set -ex

# TODO This is the "test phase", tweak it as you see fit
main() {
test -f Cargo.lock || cargo generate-lockfile

cross build --target $TARGET
cross build --target $TARGET --release

if [ -z $DISABLE_TESTS ]; then
cross test --target $TARGET
cross test --target $TARGET --release

cross run --target $TARGET
cross run --target $TARGET --release
if [ -n $DISABLE_TESTS ]; then
return
fi

cross test --target $TARGET
cross test --target $TARGET --release

cross run --target $TARGET
cross run --target $TARGET --release
}

# we don't run the "test phase" when doing deploys
Expand Down

0 comments on commit ac4bc1b

Please sign in to comment.