From e55e08d2044ea2b5643312d8fece6085471f90e8 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Mon, 16 Oct 2017 13:16:54 -0700 Subject: [PATCH] appveyor support --- .appveyor.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 10 +++++++--- README.md | 2 +- 3 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..37ce6efac --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,48 @@ +environment: + global: + PROJECT_NAME: actix + matrix: + # Stable channel + - TARGET: i686-pc-windows-gnu + CHANNEL: stable + - TARGET: i686-pc-windows-msvc + CHANNEL: stable + - TARGET: x86_64-pc-windows-gnu + CHANNEL: stable + - TARGET: x86_64-pc-windows-msvc + CHANNEL: stable + # Beta channel + - TARGET: i686-pc-windows-gnu + CHANNEL: beta + - TARGET: i686-pc-windows-msvc + CHANNEL: beta + - TARGET: x86_64-pc-windows-gnu + CHANNEL: beta + - TARGET: x86_64-pc-windows-msvc + CHANNEL: beta + # Nightly channel + - TARGET: i686-pc-windows-gnu + CHANNEL: nightly + - TARGET: i686-pc-windows-msvc + CHANNEL: nightly + - TARGET: x86_64-pc-windows-gnu + CHANNEL: nightly + - TARGET: x86_64-pc-windows-msvc + CHANNEL: nightly + +# Install Rust and Cargo +# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml) +install: + - curl -sSf -o rustup-init.exe https://win.rustup.rs + - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin + - rustc -Vv + - cargo -V + +# 'cargo test' takes care of building for us, so disable Appveyor's build stage. +build: false + +# Equivalent to Travis' `script` phase +test_script: + - cargo build --no-default-features + - cargo test --no-default-features diff --git a/Cargo.toml b/Cargo.toml index 414fba9c7..65f65407c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,11 @@ license = "Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] build = "build.rs" +[badges] +travis-ci = { repository = "fafhrd91/actix-web", branch = "master" } +appveyor = { repository = "fafhrd91/actix-web" } +codecov = { repository = "fafhrd91/actix-web", branch = "master", service = "github" } + [lib] name = "actix_web" path = "src/lib.rs" @@ -49,12 +54,11 @@ tokio-proto = "0.1" log = "0.3" env_logger = "*" -#actix = { git="https://github.com/fafhrd91/actix.git" } - [dependencies.actix] #path = "../actix" git = "https://github.com/fafhrd91/actix.git" -features = ["signal"] +default-features = false +features = [] [dev-dependencies] skeptic = "0.13" diff --git a/README.md b/README.md index c0bd37ada..d4b499aa2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Actix web [![Build Status](https://travis-ci.org/fafhrd91/actix-web.svg?branch=master)](https://travis-ci.org/fafhrd91/actix-web) [![codecov](https://codecov.io/gh/fafhrd91/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/fafhrd91/actix-web) +# Actix web [![Build Status](https://travis-ci.org/fafhrd91/actix-web.svg?branch=master)](https://travis-ci.org/fafhrd91/actix-web) [![Build Status](https://ci.appveyor.com/api/projects/status/github/fafhrd91/actix-web?branch=master&svg=true)](https://ci.appveyor.com/project/fafhrd91/actix-web) [![codecov](https://codecov.io/gh/fafhrd91/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/fafhrd91/actix-web) Web framework for Actix.