Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ delete_merged_branches = true
required_approvals = 1
status = [
"continuous-integration/travis-ci/push",
"continuous-integration/appveyor/branch"
]
timeout_sec = 14400
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ matrix:
- env: TARGET=x86_64-apple-darwin
os: osx

# Windows
- env: TARGET=x86_64-pc-windows-msvc
os: windows

install:
- bash ci/install.sh

Expand Down Expand Up @@ -76,6 +80,8 @@ branches:
only:
- staging
- trying
# release tags
- /^v\d+\.\d+\.\d+.*$/

notifications:
email:
Expand Down
66 changes: 0 additions & 66 deletions appveyor.yml

This file was deleted.

19 changes: 0 additions & 19 deletions ci/before_deploy.ps1

This file was deleted.

32 changes: 14 additions & 18 deletions ci/before_deploy.sh
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
set -ex
set -euxo pipefail

main() {
local src=$(pwd) \
stage=
if [ $TARGET = x86_64-pc-windows-msvc ]; then
cargo=cargo
else
cargo=cross
fi

case $TRAVIS_OS_NAME in
linux)
stage=$(mktemp -d)
;;
osx)
stage=$(mktemp -d -t tmp)
;;
esac
$cargo rustc --bin svd2rust --target $TARGET --release -- -C lto

cross rustc --bin svd2rust --target $TARGET --release -- -C lto
rm -rf stage
mkdir stage
cp target/$TARGET/release/svd2rust stage

cp target/$TARGET/release/svd2rust $stage/
pushd stage
tar czf ../$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
popd

cd $stage
tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
cd $src

rm -rf $stage
rm -rf stage
}

main
4 changes: 3 additions & 1 deletion ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ set -euxo pipefail

main() {
local sort=
if [ $TRAVIS_OS_NAME = linux ]; then
if [ $TRAVIS_OS_NAME = windows ]; then
return
elif [ $TRAVIS_OS_NAME = linux ]; then
sort=sort
else
sort=gsort
Expand Down
5 changes: 5 additions & 0 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ test_svd() {
}

main() {
if [ $TRAVIS_OS_NAME = windows ]; then
cargo check --target $TARGET
return
fi

cross check --target $TARGET

if [ -z ${VENDOR-} ]; then
Expand Down