diff --git a/circle.yml b/circle.yml index 0a8ac6b2f..2b60be25e 100644 --- a/circle.yml +++ b/circle.yml @@ -1,26 +1,41 @@ -machine: - node: - version: 5.5.0 - ruby: - version: 2.1.2 - -general: - branches: - only: - - master # ignore PRs and branches - -dependencies: - pre: - - ./scripts/docs/prepare.sh - cache_directories: - - "~/ionic-site" # cache ionic-site - -test: - override: - - echo "No tests to run" - -deployment: - staging: - branch: master - commands: - - ./scripts/docs/update_docs.sh +version: 2 +jobs: + build: + working_directory: ~/ionic-native/ + docker: + - image: node:7 + branches: + - only: + - cci2 + steps: + - checkout + - restore_cache: + key: ionic-site + - run: + name: Prepare ionic-site repo + command: ./scripts/docs/prepare.sh + - save_cache: + key: ionic-site + paths: + - ~/ionic-site/ + - restore_cache: + key: node_modules_{{ checksum "package.json" }} + - run: + name: Install node modules + command: npm i + - 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 diff --git a/src/@ionic-native/plugins/status-bar/index.ts b/src/@ionic-native/plugins/status-bar/index.ts index b67a99e7e..aacfd1957 100644 --- a/src/@ionic-native/plugins/status-bar/index.ts +++ b/src/@ionic-native/plugins/status-bar/index.ts @@ -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 - * - * this.statusBar.backgroundColorByHexString('#ffffff'); // set status bar to white + * // set status bar to white + * this.statusBar.backgroundColorByHexString('#ffffff'); * ``` * */