From 0c472ccd7b6fe66421ad3f2a33497d0fb348e259 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 11 Mar 2018 14:59:03 +0900 Subject: [PATCH 1/4] Add CircleCI --- .circleci/config.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..2831d12 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,69 @@ +version: 2 +jobs: + install_firefox: + docker: + - image: circleci/node:9-stretch + environment: + - FIREFOX_VERSION: "59.0b9" + working_directory: ~ + steps: + - restore_cache: + key: firefox-bin + paths: + - ~/firefox + - run: + name: Install Firefox + command: | + test -d ~/firefox/${FIREFOX_VERSION} && exit 0 + url=https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 + curl -sSL -o- "$url" | tar xvfj - + mkdir -p ~/firefox + mv firefox ~/firefox/${FIREFOX_VERSION} + - save_cache: + key: firefox-bin + paths: + - ~/firefox + npm_install: + docker: + - image: circleci/node:9-stretch-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ checksum "package.json" }} + - run: + name: Install npm wee + command: npm install + - save_cache: + key: dependency-cache-{{ checksum "package.json" }} + paths: + - node_modules + build: + docker: + - image: circleci/node:9-stretch-browsers + environment: + - FIREFOX_VERSION: "59.0b9" + steps: + - run: sudo apt-get update && sudo apt-get install -y libgtk-3-0 libdbus-glib-1-2 + - checkout + - restore_cache: + key: firefox-bin + - restore_cache: + key: dependency-cache-{{ checksum "package.json" }} + - run: echo 'export PATH=~/firefox/$FIREFOX_VERSION:$PATH' >> $BASH_ENV + - run: npm run lint + - run: npm test + - run: npm run package + - run: npm run build + - run: npm run ambassador:build + - run: node e2e/web-server & npm run test:e2e + +workflows: + version: 2 + build_and_test: + jobs: + - install_firefox + - npm_install + - build: + requires: + - install_firefox + - npm_install From 70db6d29cf2ca1e15403b793d656d38eef2aabac Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 11 Mar 2018 18:21:37 +0900 Subject: [PATCH 2/4] Goodble Travis CI --- .travis.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 60cb22d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: node_js -node_js: - - "6" -addons: - firefox: "58.0" -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start -cache: - directories: - - node_modules -script: - - npm run lint - - npm test - - npm run package - - npm run build - - npm run ambassador:build - - node e2e/web-server & npm run test:e2e From 34f96a6b7531d161aa8e79296b392366eb4d94ce Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 11 Mar 2018 18:25:10 +0900 Subject: [PATCH 3/4] Merge to single job --- .circleci/config.yml | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2831d12..f250125 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2 jobs: - install_firefox: + build: docker: - - image: circleci/node:9-stretch + - image: circleci/node:9-stretch-browsers environment: - FIREFOX_VERSION: "59.0b9" working_directory: ~ @@ -23,10 +23,8 @@ jobs: key: firefox-bin paths: - ~/firefox - npm_install: - docker: - - image: circleci/node:9-stretch-browsers - steps: + - run: sudo apt-get update && sudo apt-get install -y libgtk-3-0 libdbus-glib-1-2 + - checkout - restore_cache: key: dependency-cache-{{ checksum "package.json" }} @@ -37,14 +35,7 @@ jobs: key: dependency-cache-{{ checksum "package.json" }} paths: - node_modules - build: - docker: - - image: circleci/node:9-stretch-browsers - environment: - - FIREFOX_VERSION: "59.0b9" - steps: - - run: sudo apt-get update && sudo apt-get install -y libgtk-3-0 libdbus-glib-1-2 - - checkout + - restore_cache: key: firefox-bin - restore_cache: @@ -56,14 +47,3 @@ jobs: - run: npm run build - run: npm run ambassador:build - run: node e2e/web-server & npm run test:e2e - -workflows: - version: 2 - build_and_test: - jobs: - - install_firefox - - npm_install - - build: - requires: - - install_firefox - - npm_install From 7acda4340a4ee3679bbbccf35ab1533308ad4df6 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 11 Mar 2018 20:39:56 +0900 Subject: [PATCH 4/4] clean circleci --- .circleci/config.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f250125..5882b7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,19 +27,15 @@ jobs: - checkout - restore_cache: - key: dependency-cache-{{ checksum "package.json" }} + key: dependency-cache-{{ checksum "package-lock.json" }} - run: name: Install npm wee command: npm install - save_cache: - key: dependency-cache-{{ checksum "package.json" }} + key: dependency-cache-{{ checksum "package-lock.json" }} paths: - node_modules - - restore_cache: - key: firefox-bin - - restore_cache: - key: dependency-cache-{{ checksum "package.json" }} - run: echo 'export PATH=~/firefox/$FIREFOX_VERSION:$PATH' >> $BASH_ENV - run: npm run lint - run: npm test