From 9b7120de09c287fecab3d1f340380406aff8b8f6 Mon Sep 17 00:00:00 2001 From: Matthew Ross Date: Wed, 21 Mar 2018 18:03:08 -0400 Subject: [PATCH] Update readme and CI test --- .travis.yml | 2 -- README.md | 14 +++++++------- package.json | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60b4546..b158a6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ before_script: - npm i - touch tests.db - chmod a+w tests.db -script: - - npm run test-all after_success: - echo -e " version.php - curl "https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh" -o dropbox_uploader.sh diff --git a/README.md b/README.md index e3451e9..40494e9 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The goal of TaskBoard is to provide a simple and clean interface to a functional ### Prerequisites -A web server running PHP 5.6, 7.0, or 7.1 with sqlite enabled. +A web server running PHP 5.6, or 7.x with sqlite enabled. The server must have `sqlite3` and `php7-sqlite` (or `php5-sqlite`) installed. @@ -156,11 +156,11 @@ Because I like seeing the numbers. Language | Files | Blank | Comment | Code -------------|--------:|---------:|--------:|---------: -TypeScript | 62 | 862 | 38 | 3937 +TypeScript | 64 | 880 | 88 | 4029 PHP | 19 | 624 | 27 | 1997 -HTML | 19 | 152 | 1 | 1420 -SASS | 14 | 270 | 12 | 1216 -__SUM:__ | __114__ | __1908__ | __78__ | __8570__ +HTML | 19 | 150 | 1 | 1419 +SASS | 14 | 269 | 12 | 1215 +__SUM:__ | __114__ | __1923__ | __128__ | __8660__ Command: `cloc --exclude-dir=vendor --exclude-ext=json src/` @@ -168,9 +168,9 @@ Command: `cloc --exclude-dir=vendor --exclude-ext=json src/` Language | Files | Blank | Comment | Code -------------|-------:|---------:|--------:|---------: -JavaScript | 45 | 624 | 53 | 2478 +TypeScript | 5 | 37 | 0 | 207 PHP | 11 | 742 | 16 | 2205 -__SUM:__ | __56__ | __1366__ | __69__ | __4683__ +__SUM:__ | __16__ | __779__ | __16__ | __2412__ Command: `cloc --exclude-ext=xml test/` diff --git a/package.json b/package.json index 0c3c43f..ed9f617 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "build": "ng b -oh=none -prod && chmod a+w dist/api", "watch": "ng b -oh=none -w", "test-app": "ng test -cc -sr", - "test-all": "npm run test && npm run test-api", + "test": "npm run test-app && npm run test-api", "test-watch": "ng test -cc", "test-api": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml", "test-api-single": "./src/api/vendor/phpunit/phpunit/phpunit -c test/api/phpunit.xml -g single",