Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #288 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Nov 28, 2019
2 parents 7a36788 + 201a135 commit 2fc31b8
Show file tree
Hide file tree
Showing 4 changed files with 218 additions and 91 deletions.
37 changes: 37 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ workflows:
node-multi-build:
jobs:
- gally-create-pr
- test-node-v13:
requires:
- gally-create-pr
- test-node-v12:
requires:
- gally-create-pr
Expand All @@ -12,6 +15,7 @@ workflows:
- gally-auto-approve:
requires:
- gally-create-pr
- test-node-v13
- test-node-v12
- test-node-v10
filters:
Expand All @@ -20,6 +24,7 @@ workflows:
- release:
requires:
- gally-create-pr
- test-node-v13
- test-node-v12
- test-node-v10
filters:
Expand Down Expand Up @@ -151,3 +156,35 @@ jobs:
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
test-node-v13:
docker:
- image: 'circleci/node:13'
steps:
- checkout
- run:
command: |
# sync submodules as checkout doesn't do this automatically
if [[ $(git config --file .gitmodules --get-regexp path) ]]; then
git submodule sync && git submodule update --init
fi
- run:
command: |
if [[ -n "${NPM_TOKEN}" ]]; then
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
fi
- restore_cache:
name: Restore Yarn Package Cache
keys:
- 'yarn-packages-{{ checksum "yarn.lock" }}'
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile
- save_cache:
name: Save Yarn Package Cache
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
paths:
- ~/.cache/yarn
- run: yarn test
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
1 change: 1 addition & 0 deletions .gally.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"strict": true,
"contexts": [
"ci/circleci: gally-create-pr",
"ci/circleci: test-node-v13",
"ci/circleci: test-node-v12",
"ci/circleci: test-node-v10"
]
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@
},
"homepage": "https://github.com/blackflux/object-align#readme",
"devDependencies": {
"@babel/cli": "7.7.0",
"@babel/core": "7.7.2",
"@babel/plugin-proposal-object-rest-spread": "7.6.2",
"@babel/register": "7.7.0",
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.4",
"@babel/register": "7.7.4",
"@blackflux/eslint-plugin-rules": "1.3.16",
"@blackflux/robo-config-plugin": "2.6.17",
"@blackflux/robo-config-plugin": "3.0.1",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.7",
"eslint": "6.6.0",
"coveralls": "3.0.9",
"eslint": "6.7.1",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-json": "2.0.1",
"eslint-plugin-markdown": "1.0.1",
"eslint-plugin-mocha": "6.2.1",
"js-gardener": "2.0.114",
"eslint-plugin-mocha": "6.2.2",
"js-gardener": "2.0.115",
"nyc": "14.1.1",
"semantic-release": "15.13.31"
},
Expand Down
Loading

0 comments on commit 2fc31b8

Please sign in to comment.