Skip to content

Commit

Permalink
Merge pull request #448 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Sep 2, 2021
2 parents 90befb6 + f602574 commit 3079022
Show file tree
Hide file tree
Showing 4 changed files with 888 additions and 567 deletions.
36 changes: 18 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ workflows:
node-multi-build:
jobs:
- gally-create-pr
- test-node-v15:
- test-node-v16:
requires:
- gally-create-pr
- test-node-v14:
Expand All @@ -15,7 +15,7 @@ workflows:
- gally-auto-approve:
requires:
- gally-create-pr
- test-node-v15
- test-node-v16
- test-node-v14
- test-node-v12
filters:
Expand All @@ -24,7 +24,7 @@ workflows:
- release:
requires:
- gally-create-pr
- test-node-v15
- test-node-v16
- test-node-v14
- test-node-v12
filters:
Expand All @@ -34,14 +34,14 @@ version: 2
jobs:
gally-create-pr:
docker:
- image: 'circleci/node:14'
- image: circleci/node:14
steps:
- checkout
- run: sudo yarn global add gally
- run: ga promote $CIRCLE_BRANCH
test-node-v12:
docker:
- image: 'circleci/node:12'
- image: circleci/node:12
steps:
- checkout
- run:
Expand All @@ -58,13 +58,13 @@ jobs:
- restore_cache:
name: Restore Yarn Package Cache
keys:
- 'yarn-packages-{{ checksum "yarn.lock" }}'
- 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" }}'
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn test
Expand All @@ -73,7 +73,7 @@ jobs:
1);
gally-auto-approve:
docker:
- image: 'circleci/node:14'
- image: circleci/node:14
steps:
- run:
name: Set PR number
Expand All @@ -92,7 +92,7 @@ jobs:
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
release:
docker:
- image: 'circleci/node:14'
- image: circleci/node:14
steps:
- checkout
- run:
Expand All @@ -109,19 +109,19 @@ jobs:
- restore_cache:
name: Restore Yarn Package Cache
keys:
- 'yarn-packages-{{ checksum "yarn.lock" }}'
- 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" }}'
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn run semantic-release
test-node-v14:
docker:
- image: 'circleci/node:14'
- image: circleci/node:14
steps:
- checkout
- run:
Expand All @@ -138,13 +138,13 @@ jobs:
- restore_cache:
name: Restore Yarn Package Cache
keys:
- 'yarn-packages-{{ checksum "yarn.lock" }}'
- 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" }}'
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn test
Expand All @@ -156,9 +156,9 @@ jobs:
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
yarn run coveralls
fi
test-node-v15:
test-node-v16:
docker:
- image: 'circleci/node:15'
- image: circleci/node:16
steps:
- checkout
- run:
Expand All @@ -175,13 +175,13 @@ jobs:
- restore_cache:
name: Restore Yarn Package Cache
keys:
- 'yarn-packages-{{ checksum "yarn.lock" }}'
- 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" }}'
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn test
Expand Down
2 changes: 1 addition & 1 deletion .gally.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"strict": true,
"contexts": [
"ci/circleci: gally-create-pr",
"ci/circleci: test-node-v15",
"ci/circleci: test-node-v16",
"ci/circleci: test-node-v14",
"ci/circleci: test-node-v12"
]
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
"author": "Lukas Siemon",
"license": "MIT",
"devDependencies": {
"@babel/cli": "7.13.10",
"@babel/core": "7.13.10",
"@babel/register": "7.13.8",
"@babel/cli": "7.14.8",
"@babel/core": "7.15.0",
"@babel/register": "7.15.3",
"@blackflux/eslint-plugin-rules": "2.0.3",
"@blackflux/robo-config-plugin": "5.0.0",
"@blackflux/robo-config-plugin": "5.3.0",
"babel-eslint": "10.1.0",
"babel-preset-latest-node": "5.5.1",
"chai": "4.3.4",
"coveralls": "3.1.0",
"eslint": "7.22.0",
"coveralls": "3.1.1",
"eslint": "7.32.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-json": "2.1.2",
"eslint-plugin-markdown": "2.0.0",
"eslint-plugin-mocha": "8.1.0",
"eslint-plugin-import": "2.24.2",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-markdown": "2.2.0",
"eslint-plugin-mocha": "9.0.0",
"js-gardener": "3.0.3",
"node-tdd": "3.0.4",
"nyc": "15.1.0",
"request": "2.88.2",
"request-promise-native": "1.0.9",
"semantic-release": "17.4.2"
"semantic-release": "17.4.7"
},
"peerDependencies": {
"request": "^2.88.2",
Expand Down

0 comments on commit 3079022

Please sign in to comment.