Skip to content

Commit

Permalink
Merge branch 'rc/poc-3'
Browse files Browse the repository at this point in the history
  • Loading branch information
doitian committed Nov 19, 2018
2 parents 61fcd44 + 81deca5 commit 64f3eca
Show file tree
Hide file tree
Showing 165 changed files with 18,696 additions and 7,895 deletions.
37 changes: 37 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
; -*- conf -*-
; EditorConfig is awesome: http://EditorConfig.org

; Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = false
charset = utf-8
indent_style = space
indent_size = 2
tab_width = 2

[*.{md,markdown}]
indent_style = space
indent_size = 4
tab_width = 4

[Makefile]
indent_style = tab
indent_size = 4
tab_width = 4

[*.mk]
indent_style = tab
indent_size = 4
tab_width = 4

[*.py]
indent_style = space
indent_size = 4
tab_width = 4

[*.rs]
indent_style = space
indent_size = 4
tab_width = 4
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

# intermedia file directory
target/
target-cache/
*/target/
admintool/example/

Expand All @@ -28,7 +29,7 @@ admintool/example/
.idea
*.iml
# mac stuff
.
.DS_Store

# vagrant file
.vagrant
Expand Down
51 changes: 33 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,46 @@
language: rust
sudo: true
branches:
only:
- master
- develop
cache:
cargo: true
timeout: 1024
directories:
- $HOME/.cargo
- target-cache

env:
global:
- CLIPPY_VERSION=0.0.187
- CLIPPY_VERSION=0.0.204
- RUST_BACKTRACE=full

matrix:
include:
- os: osx
rust: nightly-2018-03-07
before_script:
- rustup component add rustfmt-preview --toolchain=nightly-2018-03-07
- bash -c 'if [[ ! -e $HOME/.cargo/bin/cargo-clippy ]]; then
cargo install clippy --vers $CLIPPY_VERSION --force;
fi'
- rust: nightly-2018-03-07
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y git autoconf flex bison texinfo libtool
before_script:
- rustup component add rustfmt-preview --toolchain=nightly-2018-03-07
- bash -c 'if [[ ! -e $HOME/.cargo/bin/cargo-clippy ]]; then
cargo install clippy --vers $CLIPPY_VERSION --force;
fi'
rust: nightly-2018-05-23
install:
- cargo fmt --version || rustup component add rustfmt-preview --toolchain=nightly-2018-05-23
- cargo clippy --version || cargo install clippy --vers $CLIPPY_VERSION --force
env: SUITE=ci
- rust: nightly-2018-05-23
addons:
apt:
packages:
- git
- autoconf
- flex
- bison
- texinfo
- libtool
env: SUITE=ci-quick

script:
- make ci
- make info
- make "$SUITE"

before_install:
- make cache-warm

before_cache:
- make cache-clean
Loading

0 comments on commit 64f3eca

Please sign in to comment.