Merge #255

255: [WIP] move windows ci to travis r=therealprof a=japaric



Co-authored-by: Jorge Aparicio <[email protected]>

Author: bors[bot]

.github/bors.toml

@@ -3,6 +3,5 @@ delete_merged_branches = true
 required_approvals = 1
 status = [
   "continuous-integration/travis-ci/push",
-  "continuous-integration/appveyor/branch"
 ]
 timeout_sec = 14400

.travis.yml

@@ -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
 
@@ -76,6 +80,8 @@ branches:
   only:
     - staging
     - trying
+    # release tags
+    - /^v\d+\.\d+\.\d+.*$/
 
 notifications:
   email:

appveyor.yml

@@ -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

ci/before_deploy.ps1

@@ -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

ci/before_deploy.sh

@@ -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