Skip to content

Commit

Permalink
Merge pull request #27 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Mar 8, 2021
2 parents 609aeab + 6d903ba commit 7f46d97
Show file tree
Hide file tree
Showing 8 changed files with 726 additions and 585 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"presets": [["latest-node", {"target": "10"}]],
"presets": [["latest-node", {"target": "12"}]],
"plugins": [],
"sourceMaps": false
}
76 changes: 38 additions & 38 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@ workflows:
node-multi-build:
jobs:
- gally-create-pr
- test-node-v14:
- test-node-v15:
requires:
- gally-create-pr
- test-node-v12:
- test-node-v14:
requires:
- gally-create-pr
- test-node-v10:
- test-node-v12:
requires:
- gally-create-pr
- gally-auto-approve:
requires:
- gally-create-pr
- test-node-v15
- test-node-v14
- test-node-v12
- test-node-v10
filters:
branches:
only: /dependabot\/.*/
- release:
requires:
- gally-create-pr
- test-node-v15
- test-node-v14
- test-node-v12
- test-node-v10
filters:
branches:
only: master
version: 2
jobs:
gally-create-pr:
docker:
- image: 'circleci/node:12'
- image: 'circleci/node:14'
steps:
- checkout
- run: sudo yarn global add gally
Expand Down Expand Up @@ -71,6 +71,11 @@ jobs:
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
- run:
command: |
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
yarn run coveralls
fi
test-node-v12:
docker:
- image: 'circleci/node:12'
Expand Down Expand Up @@ -103,14 +108,28 @@ jobs:
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
gally-auto-approve:
docker:
- image: 'circleci/node:14'
steps:
- run:
command: |
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
yarn run coveralls
fi
test-node-v10:
name: Set PR number
command: >
echo 'export
CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
>> $BASH_ENV
source $BASH_ENV
echo $CIRCLE_PR_NUMBER
- checkout
- run: sudo yarn global add gally
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
release:
docker:
- image: 'circleci/node:10'
- image: 'circleci/node:14'
steps:
- checkout
- run:
Expand All @@ -136,32 +155,10 @@ jobs:
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
paths:
- ~/.cache/yarn
- run: yarn test
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
gally-auto-approve:
docker:
- image: 'circleci/node:12'
steps:
- run:
name: Set PR number
command: >
echo 'export
CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
>> $BASH_ENV
source $BASH_ENV
echo $CIRCLE_PR_NUMBER
- checkout
- run: sudo yarn global add gally
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
release:
- run: yarn run semantic-release
test-node-v15:
docker:
- image: 'circleci/node:12'
- image: 'circleci/node:15'
steps:
- checkout
- run:
Expand All @@ -187,4 +184,7 @@ jobs:
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
paths:
- ~/.cache/yarn
- run: yarn run semantic-release
- run: yarn test
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
8 changes: 6 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"root": true,
"extends": ["airbnb-base", "plugin:mocha/recommended"],
"extends": [
"airbnb-base",
"plugin:mocha/recommended",
"plugin:markdown/recommended"
],
"rules": {
"mocha/no-mocha-arrows": 0,
"mocha/no-hooks-for-single-case": 0,
Expand Down Expand Up @@ -37,6 +41,6 @@
},
"env": {"es6": true, "node": true, "mocha": true},
"globals": {},
"plugins": ["json", "mocha", "markdown", "@blackflux/rules"],
"plugins": ["json", "mocha", "@blackflux/rules"],
"parser": "babel-eslint"
}
4 changes: 2 additions & 2 deletions .gally.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"strict": true,
"contexts": [
"ci/circleci: gally-create-pr",
"ci/circleci: test-node-v15",
"ci/circleci: test-node-v14",
"ci/circleci: test-node-v12",
"ci/circleci: test-node-v10"
"ci/circleci: test-node-v12"
]
},
"enforce_admins": true,
Expand Down
2 changes: 1 addition & 1 deletion .roboconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"assorted/@npm-opensource"
],
"variables": {
"nodeVersion": "10",
"nodeVersion": "12",
"repoKey": "blackflux/object-lib",
"packageName": "object-lib",
"projectName": "object-lib",
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ For more extensive examples, please refer to the tests.
Align the ordering of one object recursively to a reference object.

_Example:_
<!-- eslint-disable import/no-unresolved -->
<!-- eslint-disable import/no-unresolved,import/no-extraneous-dependencies -->
```js
const { align } = require('object-lib');

Expand All @@ -44,7 +44,7 @@ Fields targeted by excluded needles are removed entirely from the result.
Needles are declared using the [object-scan](https://github.com/blackflux/object-scan) syntax.

_Example:_
<!-- eslint-disable import/no-unresolved,no-console -->
<!-- eslint-disable import/no-unresolved,no-console,import/no-extraneous-dependencies -->
```js
const { clone } = require('object-lib');

Expand Down Expand Up @@ -74,7 +74,7 @@ and the respective values are _contained_.
All other types are contained if they match exactly (`===`).

_Example:_
<!-- eslint-disable import/no-unresolved -->
<!-- eslint-disable import/no-unresolved,import/no-extraneous-dependencies -->
```js
const { contains } = require('object-lib');

Expand All @@ -94,7 +94,7 @@ If a function is passed, it is invoked with the value, and the result is used as
The paths are defined using [object-scan](https://github.com/blackflux/object-scan) syntax.

_Example:_
<!-- eslint-disable import/no-unresolved -->
<!-- eslint-disable import/no-unresolved,import/no-extraneous-dependencies -->
```js
const { Merge } = require('object-lib');

Expand Down
24 changes: 12 additions & 12 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.12.10",
"@babel/core": "7.12.10",
"@babel/register": "7.12.10",
"@babel/cli": "7.13.0",
"@babel/core": "7.13.8",
"@babel/register": "7.13.8",
"@blackflux/eslint-plugin-rules": "1.3.45",
"@blackflux/robo-config-plugin": "4.0.4",
"@blackflux/robo-config-plugin": "4.1.3",
"babel-eslint": "10.1.0",
"babel-preset-latest-node": "5.4.0",
"chai": "4.2.0",
"chai": "4.3.3",
"coveralls": "3.1.0",
"eslint": "7.18.0",
"eslint": "7.21.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-json": "2.1.2",
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "8.0.0",
"js-gardener": "2.0.184",
"eslint-plugin-markdown": "2.0.0",
"eslint-plugin-mocha": "8.1.0",
"js-gardener": "2.0.186",
"lodash.clonedeep": "4.5.0",
"lodash.samplesize": "4.2.0",
"node-tdd": "2.19.1",
"nyc": "15.1.0",
"semantic-release": "17.3.7"
"semantic-release": "17.4.1"
},
"licenses": [
{
Expand Down Expand Up @@ -107,9 +107,9 @@
"url": "https://github.com/blackflux/object-lib/issues"
},
"engines": {
"node": ">= 10"
"node": ">= 12"
},
"dependencies": {
"object-scan": "13.8.0"
"object-scan": "13.9.1"
}
}
Loading

0 comments on commit 7f46d97

Please sign in to comment.