Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' into renovate/docker-docker-digests
Browse files Browse the repository at this point in the history
  • Loading branch information
hutson authored May 30, 2018
2 parents cfa9697 + 301a4ba commit 0dcdccf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 36 deletions.
36 changes: 8 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
version: 2

node_4: &node_4
docker:
- image: node:4@sha256:41d0ad2557ea2a9e57e1a458c1d659e92f601586e07dcffef74c9cef542f6f6e

node_6: &node_6
docker:
- image: node:6@sha256:9b239b645d2afacec35ada5ec2affd570e8acec2abdcfd1d0fe640329b22093e
Expand All @@ -15,19 +11,6 @@ node_8: &node_8
node_next: &node_next
docker:
- image: node:latest@sha256:055fe494189c1a9153d29bc1f666df25556ba8d08da92dee730cf840413d9055
steps:
- checkout
- restore_cache:
keys:
- dependencies_yarn_latest
- run: curl -o- -L https://yarnpkg.com/install.sh | bash
- run: yarn install --frozen-lockfile
- save_cache:
paths:
- node_modules
- ${HOME}/.cache/yarn
key: dependencies_yarn_latest
- run: yarn test && ($(yarn bin)/codecov || echo "Codecov did not collect coverage reports")

yarn_latest: &yarn_latest
steps:
Expand All @@ -42,30 +25,29 @@ yarn_latest: &yarn_latest
- node_modules
- ${HOME}/.cache/yarn
key: dependencies_yarn_latest
- run: yarn test && ($(yarn bin)/codecov || echo "Codecov did not collect coverage reports")
- run: yarn test
- run: ($(yarn bin)/codecov || echo "Codecov did not collect coverage reports")

jobs:
node_4_yarn_latest:
<<: [*node_4, *yarn_latest]
node_6_yarn_latest:
<<: [*node_6, *yarn_latest]
node_8_yarn_latest:
<<: [*node_8, *yarn_latest]
node_next:
<<: [*node_next]
release:
<<: [*node_next, *yarn_latest]
deliver:
<<: [*node_8]
steps:
- checkout
- restore_cache:
keys:
- dependencies_release
- dependencies_deliver
- run: yarn install --frozen-lockfile
- save_cache:
paths:
- node_modules
- ${HOME}/.cache/yarn
key: dependencies_release
key: dependencies_deliver
- run: $(yarn bin)/semantic-release-github
publish:
<<: [*node_8]
Expand All @@ -86,21 +68,19 @@ workflows:
version: 2
build:
jobs:
- node_4_yarn_latest
- node_6_yarn_latest
- node_8_yarn_latest
- node_next
- release:
- deliver:
filters:
branches:
only: master
requires:
- node_4_yarn_latest
- node_6_yarn_latest
- node_8_yarn_latest
- publish:
filters:
tags:
only: /.+/
requires:
- release
- deliver
9 changes: 1 addition & 8 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
coverage:
status:
project:
default:
enabled: false
patch:
default:
enabled: false
comment: off

0 comments on commit 0dcdccf

Please sign in to comment.