Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature1147 #1224

Merged
merged 22 commits into from
Sep 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
language: python
sudo: required
dist: trusty

addons:
apt:
packages:
- libsecret-1-dev
matrix:
include:
# # Use the built in venv for linux builds
# - os: linux
# sudo: required
# python: 2.7
- os: linux
sudo: required
python: 2.7
- os: linux
sudo: required
python: 3.5
# # Use generic language for osx
# - os: osx
# language: generic
# env: PYTHON=2.7.10
# # Use generic language for osx
- os: osx
language: generic
env: PYTHON=2.7.10
# Use generic language for osx
- os: osx
language: generic
env: PYTHON=3.5.1
Expand All @@ -28,8 +33,8 @@ before_install: |
git submodule update --init --recursive
git clone https://github.com/creationix/nvm.git ./.nvm
source ./.nvm/nvm.sh
nvm install 6.6.0
nvm use 6.6.0
nvm install 7.2.1
nvm use 7.2.1
npm config set python `which python`
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update;
Expand Down
4 changes: 1 addition & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@

// we run the custom script "compile" as defined in package.json
"args": ["run", "compile", "--loglevel", "silent"],

// The tsc compiler is started in watching mode
"isWatching": true,
"isBackground": true,

// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
Expand Down
Loading