diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-05-22 06:44:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 06:44:40 +0800 |
| commit | 45ad37162287a1db30caa8eeea89442d303ea883 (patch) | |
| tree | d685780de55f5a82121cbedd123f38708e96f35b | |
| parent | 5e67951c1ae22f61bf2045e6a069aa02baf427ff (diff) | |
| parent | 7a65c22a024c799d4a2c2fb7184f185633d5eaa8 (diff) | |
| download | tangerine-wallet-browser-45ad37162287a1db30caa8eeea89442d303ea883.tar.gz tangerine-wallet-browser-45ad37162287a1db30caa8eeea89442d303ea883.tar.zst tangerine-wallet-browser-45ad37162287a1db30caa8eeea89442d303ea883.zip | |
Merge pull request #4297 from MetaMask/ci-publish-release
CI - publish release/prerelease
| -rw-r--r-- | .circleci/config.yml | 60 | ||||
| -rw-r--r-- | app/scripts/background.js | 2 | ||||
| -rw-r--r-- | package.json | 1 |
3 files changed, 56 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 81b8a7301..4d9d01ee6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,9 @@ workflows: - prep-build: requires: - prep-deps-npm + - prep-docs: + requires: + - prep-deps-npm - prep-scss: requires: - prep-deps-npm @@ -25,7 +28,7 @@ workflows: - test-e2e-firefox: requires: - prep-deps-npm - - prep-deps-firefox + - prep-deps-firefox - prep-build - test-unit: requires: @@ -63,12 +66,22 @@ workflows: - prep-deps-npm - prep-build - all-tests-pass - - job-publish: + - job-publish-prerelease: requires: - prep-deps-npm - prep-build - job-screens - all-tests-pass + - job-publish-release: + filters: + branches: + only: master + requires: + - prep-deps-npm + - prep-build + - prep-docs + - job-screens + - all-tests-pass jobs: prep-deps-npm: @@ -124,6 +137,21 @@ jobs: - dist - builds + prep-docs: + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - run: + name: build:dist + command: npm run doc + - save_cache: + key: docs-cache-{{ .Revision }} + paths: + - docs/jsdoc + prep-scss: docker: - image: circleci/node:8-browsers @@ -180,7 +208,7 @@ jobs: - store_artifacts: path: test-artifacts destination: test-artifacts - + test-e2e-firefox: environment: browsers: '["Firefox"]' @@ -200,7 +228,7 @@ jobs: - restore_cache: key: dependency-cache-{{ .Revision }} - restore_cache: - key: build-cache-{{ .Revision }} + key: build-cache-{{ .Revision }} - run: name: test:e2e:firefox command: npm run test:e2e:firefox @@ -225,7 +253,7 @@ jobs: paths: - test-artifacts - job-publish: + job-publish-prerelease: docker: - image: circleci/node:8-browsers steps: @@ -251,9 +279,29 @@ jobs: - run: name: build:announce command: ./development/metamaskbot-build-announce.js + + job-publish-release: + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ .Revision }} + - restore_cache: + key: build-cache-{{ .Revision }} + - restore_cache: + key: docs-cache-{{ .Revision }} + - restore_cache: + key: job-screens-{{ .Revision }} - run: name: sentry sourcemaps upload command: npm run sentry:publish + - run: + name: github gh-pages docs publish + command: > + git config user.name metamaskbot + git config user.email admin@metamask.io + gh-pages -d docs/jsdocs test-unit: docker: @@ -367,4 +415,4 @@ jobs: - run: name: All Tests Passed command: echo 'weew - everything passed!' - + diff --git a/app/scripts/background.js b/app/scripts/background.js index 69d549c85..686296329 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -322,7 +322,7 @@ function setupController (initState, initLangCode) { /** * A runtime.Port object, as provided by the browser: - * @link https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/runtime/Port + * @see https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/runtime/Port * @typedef Port * @type Object */ diff --git a/package.json b/package.json index 2749eccef..9e4950734 100644 --- a/package.json +++ b/package.json @@ -232,6 +232,7 @@ "ganache-cli": "^6.1.0", "ganache-core": "^2.1.0", "geckodriver": "^1.11.0", + "gh-pages": "^1.1.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", |