Skip to content

Commit

Permalink
Merge branch 'master' into publish-via-CI
Browse files Browse the repository at this point in the history
  • Loading branch information
robertohuertasm committed Jun 17, 2018
2 parents d8b902e + 0e7d6a1 commit 12fe551
Show file tree
Hide file tree
Showing 21 changed files with 528 additions and 1,508 deletions.
9 changes: 8 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,17 @@ install:
cache:
# - node_modules
- '%LOCALAPPDATA%\Yarn'
before_test:
# install coverage reporters
- npm i codeclimate-test-reporter --no-save
- npm i codecov --no-save
# run postinstall again to ensure that 'vscode.d.ts' is installed
- npm run postinstall
test_script:
# run build script
- npm run build
after_test:
# send coverage report
- ps: .\node_modules\.bin\codecov --disable=gcov
- ps: If ($env:CODECLIMATE_REPO_TOKEN -ne $null) { gc .\coverage\lcov.info | & .\node_modules\.bin\codeclimate-test-reporter }
- ps: If ($env:CODECOV_TOKEN -ne $null) { .\node_modules\.bin\codecov --disable=gcov }
build: off
37 changes: 37 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: "2"
checks:
file-lines:
enabled: false
method-complexity:
enabled: false
method-lines:
enabled: false
similar-code:
enabled: false
plugins:
markdownlint:
enabled: true
checks:
MD013:
enabled: false
MD036:
enabled: false
nodesecurity:
enabled: true
tslint:
enabled: true
exclude_patterns:
- "!src/**/*.ts"
- "!test/**/*.ts"
- "test/support"
- "docker/"
- "images/"
- "icons/"
- "locale/"
- "submodules/"
- "*.json"
- "*.yml"
- "*.lock"
- ".*"
- "wallaby.js"
- "**/*.d.ts"
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,16 @@ matrix:
fast_finish: true
cache: yarn
before_install:
- curl --compressed -L https://yarnpkg.com/install.sh | bash
- curl -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
before_script:
- npm i codeclimate-test-reporter --no-save
- npm i codecov --no-save
- npm run postinstall
script: npm run build
after_success: codecov --disable=gcov
after_success:
- if [[ $CODECLIMATE_REPO_TOKEN ]] ; then codeclimate-test-reporter < ./coverage/lcov.info ; fi
- codecov --disable=gcov

jobs:
include:
Expand Down Expand Up @@ -51,7 +57,7 @@ jobs:
os:
cache:
before_install:
script: bash ./docker/trigger-docker-vsi.sh --token $TRAVIS_TOKEN
script: curl -L $DOCKER_TRIGGER_URL | bash -s -- --token $TRAVIS_TOKEN
after_success:

- stage: docker vsi:tag
Expand All @@ -62,7 +68,7 @@ jobs:
os:
cache:
before_install:
script: bash ./docker/trigger-docker-vsi.sh --token $TRAVIS_TOKEN --tag $TRAVIS_TAG
script: curl -L $DOCKER_TRIGGER_URL | bash -s -- --token $TRAVIS_TOKEN --tag $TRAVIS_TAG
after_success:

# See this if we need to test the extension via vscode:
Expand Down
30 changes: 10 additions & 20 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.github/**
.vscode/**
.vscode-test/**
.nyc_output/**

.*/**
coverage/**
docker/**
examples/**
Expand All @@ -11,22 +9,14 @@ src/**
submodules/**
test/**
out/test/**
out/src/example/**
**/*.map
*.vsix
*.lcov
.appveyor.yml
.bithoundrc
.editorconfig
.gitignore
.gitmodules
.gitattributes
.travis.yml
crowdin.yml
package-lock.json
package.nls.template.json
tsconfig.json
tslint.json
npm-debug.*
*.lock
*.log
*.vsix
*.yml
.*
*lock.json
*.template.json
ts*.json
wallaby.js
yarn.lock
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@
[![DevDependencies Status](https://david-dm.org/vscode-icons/vscode-icons/dev-status.svg)](https://david-dm.org/vscode-icons/vscode-icons?type=dev)
[![Greenkeeper badge](https://badges.greenkeeper.io/vscode-icons/vscode-icons.svg)](https://greenkeeper.io/)

[![Maintainability](https://api.codeclimate.com/v1/badges/4f02368ebeb7be1490bb/maintainability)](https://codeclimate.com/github/vscode-icons/vscode-icons/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/4f02368ebeb7be1490bb/test_coverage)](https://codeclimate.com/github/vscode-icons/vscode-icons/test_coverage)
[![codecov](https://codecov.io/gh/vscode-icons/vscode-icons/branch/master/graph/badge.svg)](https://codecov.io/gh/vscode-icons/vscode-icons)
[![Known Vulnerabilities](https://snyk.io/test/github/vscode-icons/vscode-icons/badge.svg)](https://snyk.io/test/github/vscode-icons/vscode-icons)

[![bitHound Overall Score](https://www.bithound.io/github/vscode-icons/vscode-icons/badges/score.svg)](https://www.bithound.io/github/vscode-icons/vscode-icons)
[![bitHound Dependencies](https://www.bithound.io/github/vscode-icons/vscode-icons/badges/dependencies.svg)](https://www.bithound.io/github/vscode-icons/vscode-icons/master/dependencies/npm)
[![bitHound Dev Dependencies](https://www.bithound.io/github/vscode-icons/vscode-icons/badges/devDependencies.svg)](https://www.bithound.io/github/vscode-icons/vscode-icons/master/dependencies/npm)
[![bitHound Code](https://www.bithound.io/github/vscode-icons/vscode-icons/badges/code.svg)](https://www.bithound.io/github/vscode-icons/vscode-icons)

[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/vscode-icons/vscode-icons.svg)](https://isitmaintained.com/project/vscode-icons/vscode-icons "Average time to resolve an issue")
[![Percentage of issues still open](https://isitmaintained.com/badge/open/vscode-icons/vscode-icons.svg)](https://isitmaintained.com/project/vscode-icons/vscode-icons "Percentage of issues still open")

Expand Down
81 changes: 0 additions & 81 deletions docker/trigger-docker-vsi.sh

This file was deleted.

Loading

0 comments on commit 12fe551

Please sign in to comment.