Skip to content

Commit

Permalink
Merge branch 'ci' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
poulad committed Sep 7, 2018
2 parents ffb9bfb + 88bf67a commit 6a509e4
Show file tree
Hide file tree
Showing 10 changed files with 406 additions and 50 deletions.
4 changes: 1 addition & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# This file is the top-most EditorConfig file
root = true

# All Files
[*]
charset = utf-8
end_of_line = lf
Expand All @@ -13,7 +12,6 @@ indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

# C# Files
[*.cs]
csharp_align_multiline_parameter = true
csharp_align_multiline_extends_list = true
Expand All @@ -22,13 +20,13 @@ csharp_place_attribute_on_same_line = false
csharp_empty_block_style = together_same_line
csharp_space_within_single_line_array_initializer_braces = true

# Solution Files
[*.sln]
indent_style = tab

# XML Project Files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2
xml_wrap_tags_and_pi = false

# Configuration Files
[*.{json,xml,yml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
Expand Down
20 changes: 8 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
language: csharp
dist: trusty
sudo: false
mono: none
dotnet: 2.0.0
services:
- docker
branches:
except:
- master
- gh-pages
script: >
cd test/UnitTests &&
dotnet test --configuration Release --list-tests &&
dotnet xunit -configuration Release -nobuild -stoponfail -verbose &&
cd - &&
cd test/IntegrationTests &&
dotnet test --configuration Release --list-tests &&
dotnet xunit -configuration Release -nobuild -stoponfail -verbose
notifications:
email: false
install:
- docker pull microsoft/dotnet:2.0.0-sdk-stretch
- cd ci && npm install && cd -
script:
- node ci/travis-ci.js


## Notes:
### Disable building PRs (might expose env vars)
Expand Down
14 changes: 14 additions & 0 deletions ci/logging.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const chalk = require('chalk');
const $ = require('shelljs')

if (process.env['TRAVIS']) {
console.info = m => $.echo("\n\033[1;34m#", m, "\033[0m")
console.debug = m => $.echo("\n\033[0;32m##", m, "\033[0m")
console.warn = m => $.echo("\n\033[1;33m##", m, "\033[0m")
console.error = m => $.echo("\n\033[1;31m##", m, "\033[0m")
} else {
console.info = m => console.log(chalk.blue.bold(`\n# ${m}\n`))
console.debug = m => console.log(chalk.green.bold(`\n## ${m}\n`))
console.warn = m => console.log(chalk.yellow.bold(`\n## ${m}\n`))
console.error = m => console.log(chalk.red.bold(`\n## ${m}\n`))
}
241 changes: 241 additions & 0 deletions ci/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions ci/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "build",
"version": "1.0.0",
"scripts": {
"travis-ci": "node travis-ci.js"
},
"private": true,
"devDependencies": {
"@types/chalk": "^2.2.0",
"@types/shelljs": "^0.8.0",
"chalk": "^2.4.1",
"shelljs": "^0.8.2"
}
}
Loading

0 comments on commit 6a509e4

Please sign in to comment.