Skip to content

Commit

Permalink
Merge pull request #35 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 12, 2019
2 parents 74dbb71 + a8b0b06 commit a8851cc
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
- run: sudo yarn global add gally
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true&mergeable_state=clean"
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"
- run: >-
ga merge $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true&mergeable_state=clean"
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"
release:
docker:
- image: 'circleci/node:10'
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ It does not do it automatically or silently.
## Usage

...

## Assorted Configs

- [Npm Open Source](docs/configs/assorted/npm-opensource.md)
20 changes: 20 additions & 0 deletions docs/configs/assorted/npm-opensource.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Npm Open Source

This configuration package includes configs for various free and useful tools when open sourcing an npm package.

## Circle Ci

...

## Dependabot

...

## Semantic Release

...

## Badges

...

4 changes: 2 additions & 2 deletions src/configs/circleci/snippets/04-dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- run: sudo yarn global add gally
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true&mergeable_state=clean"
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"
- run: >-
ga merge $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true&mergeable_state=clean"
"base.ref=dev&state=open&user.login=dependabot[bot]&mergeable=true"

0 comments on commit a8851cc

Please sign in to comment.