From a78603c218a29d9d29d167d50c7a63f316639cdc Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 11:09:07 -0700 Subject: [PATCH 1/6] ci - clean - whitespace fix --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 939df8be5..7f850e4f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ workflows: - test-e2e-firefox: requires: - prep-deps-npm - - prep-deps-firefox + - prep-deps-firefox - prep-build - test-unit: requires: @@ -181,7 +181,7 @@ jobs: - store_artifacts: path: test-artifacts destination: test-artifacts - + test-e2e-firefox: environment: browsers: '["Firefox"]' @@ -201,7 +201,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 @@ -368,4 +368,3 @@ jobs: - run: name: All Tests Passed command: echo 'weew - everything passed!' - \ No newline at end of file From 2e2ef97fb5ce9b4b49c14a6abf9bf9a163d57f3a Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 11:10:42 -0700 Subject: [PATCH 2/6] ci - rename job-publish to job-publish-prerelease --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f850e4f8..7c52efa55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,7 @@ workflows: - prep-deps-npm - prep-build - all-tests-pass - - job-publish: + - job-publish-prerelease: requires: - prep-deps-npm - prep-build @@ -226,7 +226,7 @@ jobs: paths: - test-artifacts - job-publish: + job-publish-prerelease: docker: - image: circleci/node:8-browsers steps: From 8fe19a16c532c9d29daf4d8a1ef5ef4d32151f4a Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 11:29:10 -0700 Subject: [PATCH 3/6] ci - add job-publish-release --- .circleci/config.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c52efa55..b6ff80a83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,15 @@ workflows: - prep-build - job-screens - all-tests-pass + - job-publish-release: + filters: + branches: + only: master + requires: + - prep-deps-npm + - prep-build + - job-screens + - all-tests-pass jobs: prep-deps-npm: @@ -252,6 +261,18 @@ 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: job-screens-{{ .Revision }} - run: name: sentry sourcemaps upload command: npm run sentry:publish From cc6265fe0a58d88b0ae27d16638dcd25e5549379 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 11:50:46 -0700 Subject: [PATCH 4/6] ci - add prep-docs job --- .circleci/config.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6ff80a83..9db2016bc 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 @@ -134,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 From 2d4d77b17d0494182c3dc70c3d5bf9a866d384a9 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 11:52:28 -0700 Subject: [PATCH 5/6] docs - jsdoc - fix syntax --- app/scripts/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ From 59c9852999293adaeee4c036b64ca65182879e92 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 18 May 2018 14:03:02 -0700 Subject: [PATCH 6/6] ci - add docs publish to job-publish-release --- .circleci/config.yml | 9 +++++++++ package.json | 1 + 2 files changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9db2016bc..243c880be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,6 +80,7 @@ workflows: requires: - prep-deps-npm - prep-build + - prep-docs - job-screens - all-tests-pass @@ -289,11 +290,19 @@ jobs: 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: diff --git a/package.json b/package.json index f6338c542..19d3d40f1 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",