From de04e6ed9c4ef0db0b861d62e626f98ae2a0f43f Mon Sep 17 00:00:00 2001 From: ElectricImp Date: Wed, 24 Apr 2019 16:43:28 -0700 Subject: [PATCH 1/2] updated badge, removed travis.yml --- .travis.yml | 11 ----------- README.md | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bd1dd46..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: node_js - -node_js: - - "node" - -before_script: - - npm i -g imp-central-impt@latest - - impt auth login --local --lk ${EI_LOGIN_KEY} - -script: - - impt test run diff --git a/README.md b/README.md index 807d695..9cc4a6a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This library parses JSON into Squirrel data types. **To add this library to your project, add** `#require "JSONParser.class.nut:1.0.0"` **to the top of your code.** -[![Build Status](https://travis-ci.org/electricimp/JSONParser.svg?branch=master)](https://travis-ci.org/electricimp/JSONParser) +![Build Status](https://cse-ci.electricimp.com/app/rest/builds/buildType:(id:JSONParser_BuildAndTest)/statusIcon) ## Usage From 4daa467d05662e8b5a1cca55875aa660104aacac Mon Sep 17 00:00:00 2001 From: ElectricImp Date: Fri, 26 Apr 2019 15:09:51 -0700 Subject: [PATCH 2/2] added dg name to .impt.test, updated editor config spacing --- .editorconfig | 2 +- .gitignore | 1 + .impt.test | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 4a7ea30..779f99a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,7 @@ root = true [*] indent_style = space -indent_size = 2 +indent_size = 4 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true diff --git a/.gitignore b/.gitignore index 18e4d92..f130ce2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ _private *.nut.bundled devtest*.nut .imptest.local +.DS_Store diff --git a/.impt.test b/.impt.test index 594d357..c4f87f9 100644 --- a/.impt.test +++ b/.impt.test @@ -1,5 +1,6 @@ { "deviceGroupId": "dfff2ad8-cf09-3fcc-87d4-299e030e27d4", + "deviceGroupName" : "impFarm R", "timeout": 30, "stopOnFail": false, "allowDisconnect": false,