Merge pull request #1289 from driftyco/cci2

chore(): use CircleCI 2
This commit is contained in:
Perry Govier 2017-03-29 10:22:41 -05:00 committed by GitHub
commit 4f7718b03e
2 changed files with 45 additions and 29 deletions

View File

@ -1,26 +1,41 @@
machine: version: 2
node: jobs:
version: 5.5.0 build:
ruby: working_directory: ~/ionic-native/
version: 2.1.2 docker:
- image: node:7
general: branches:
branches: - only:
only: - cci2
- master # ignore PRs and branches steps:
- checkout
dependencies: - restore_cache:
pre: key: ionic-site
- ./scripts/docs/prepare.sh - run:
cache_directories: name: Prepare ionic-site repo
- "~/ionic-site" # cache ionic-site command: ./scripts/docs/prepare.sh
- save_cache:
test: key: ionic-site
override: paths:
- echo "No tests to run" - ~/ionic-site/
- restore_cache:
deployment: key: node_modules_{{ checksum "package.json" }}
staging: - run:
branch: master name: Install node modules
commands: command: npm i
- ./scripts/docs/update_docs.sh - save_cache:
key: node_modules_{{ checksum "package.json" }}
paths:
- ~/ionic-native/node_modules/
- run:
name: Run tslint
command: npm run lint
- add_ssh_keys
- deploy:
name: Update docs
command: |
if [ "${CIRCLE_BRANCH}" == "master" ]; then
./scripts/docs/update_docs.sh
else
echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
fi

View File

@ -19,10 +19,11 @@ declare var window;
* *
* ... * ...
* *
* // let status bar overlay webview
* this.statusBar.overlaysWebView(true);
* *
* this.statusBar.overlaysWebView(true); // let status bar overlay webview * // set status bar to white
* * this.statusBar.backgroundColorByHexString('#ffffff');
* this.statusBar.backgroundColorByHexString('#ffffff'); // set status bar to white
* ``` * ```
* *
*/ */