From 8a3e002aa588278f9223101f96f6f69c76037994 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Tue, 22 Aug 2017 00:04:15 +0200 Subject: [PATCH] Made Circle CI builds work (#2110) * Add CircleCI Badge * Fix typo * Replace yarn by npm * Replace yarn by npm * Always generate the artifacts * Use yarn for everything * Also pin dependencies with Yarn * Install yarn * Adjusted config * Only copy ZIP file * Only build our branches * Prevent Travis from building on macOS --- .npmrc | 1 - .travis.yml | 2 -- .yarnrc | 1 + circle.yml | 21 ++++++++++++++++++--- readme.md | 3 ++- 5 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 .npmrc create mode 100644 .yarnrc diff --git a/.npmrc b/.npmrc deleted file mode 100644 index cffe8cde..00000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -save-exact=true diff --git a/.travis.yml b/.travis.yml index 7c7bc11c..c8b96764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ language: node_js matrix: include: - - os: osx - node_js: 7.9.0 - os: linux node_js: 7.9.0 env: CC=clang CXX=clang++ npm_config_clang=1 diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 00000000..95b8581e --- /dev/null +++ b/.yarnrc @@ -0,0 +1 @@ +save-prefix false diff --git a/circle.yml b/circle.yml index dc171f2e..ee698269 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,26 @@ machine: xcode: version: 8.2 + dependencies: + pre: + - npm install -g yarn override: - - yarn install + - yarn + +test: + override: + - yarn test + deployment: - release: - tag: /.*/ + artifacts: + branch: /.*/ + owner: zeit + commands: + - yarn run dist + - cp dist/*.zip $CIRCLE_ARTIFACTS + release: + tag: /.*/ + owner: zeit commands: - yarn run dist diff --git a/readme.md b/readme.md index c9248809..00d275ac 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,8 @@ ![](https://github.com/zeit/art/blob/525bd1bb39d97dd3b91c976106a6d5cc5766b678/hyper/repo-banner.png) -[![macOS CI status](https://travis-ci.org/zeit/hyper.svg?branch=master)](https://travis-ci.org/zeit/hyper) +[![macOS CI Status](https://circleci.com/gh/zeit/hyper.svg?style=shield)](https://circleci.com/gh/zeit/hyper) [![Windows CI status](https://ci.appveyor.com/api/projects/status/kqvb4oa772an58sc?svg=true)](https://ci.appveyor.com/project/zeit/hyper) +[![Linux CI status](https://travis-ci.org/zeit/hyper.svg?branch=master)](https://travis-ci.org/zeit/hyper) [![Slack Channel](http://zeit-slackin.now.sh/badge.svg)](https://zeit.chat/) [![Changelog #213](https://img.shields.io/badge/changelog-%23213-lightgrey.svg)](https://changelog.com/213) [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)