Skip to content

Commit 84ea3ec

Browse files
authored
Merge pull request #89 from blackflux/dev
[Gally]: master <- dev
2 parents 39d621e + 653d74c commit 84ea3ec

File tree

4 files changed

+700
-574
lines changed

4 files changed

+700
-574
lines changed

.circleci/config.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ workflows:
33
node-multi-build:
44
jobs:
55
- gally-create-pr
6-
- test-node-v15:
6+
- test-node-v16:
77
requires:
88
- gally-create-pr
99
- test-node-v14:
@@ -15,7 +15,7 @@ workflows:
1515
- gally-auto-approve:
1616
requires:
1717
- gally-create-pr
18-
- test-node-v15
18+
- test-node-v16
1919
- test-node-v14
2020
- test-node-v12
2121
filters:
@@ -24,7 +24,7 @@ workflows:
2424
- release:
2525
requires:
2626
- gally-create-pr
27-
- test-node-v15
27+
- test-node-v16
2828
- test-node-v14
2929
- test-node-v12
3030
filters:
@@ -34,14 +34,14 @@ version: 2
3434
jobs:
3535
gally-create-pr:
3636
docker:
37-
- image: 'circleci/node:14'
37+
- image: circleci/node:14
3838
steps:
3939
- checkout
4040
- run: sudo yarn global add gally
4141
- run: ga promote $CIRCLE_BRANCH
4242
test-node-v14:
4343
docker:
44-
- image: 'circleci/node:14'
44+
- image: circleci/node:14
4545
steps:
4646
- checkout
4747
- run:
@@ -58,13 +58,13 @@ jobs:
5858
- restore_cache:
5959
name: Restore Yarn Package Cache
6060
keys:
61-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
61+
- yarn-packages-{{ checksum "yarn.lock" }}
6262
- run:
6363
name: Install Dependencies
6464
command: yarn install --frozen-lockfile
6565
- save_cache:
6666
name: Save Yarn Package Cache
67-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
67+
key: yarn-packages-{{ checksum "yarn.lock" }}
6868
paths:
6969
- ~/.cache/yarn
7070
- run: yarn test
@@ -78,7 +78,7 @@ jobs:
7878
fi
7979
test-node-v12:
8080
docker:
81-
- image: 'circleci/node:12'
81+
- image: circleci/node:12
8282
steps:
8383
- checkout
8484
- run:
@@ -95,13 +95,13 @@ jobs:
9595
- restore_cache:
9696
name: Restore Yarn Package Cache
9797
keys:
98-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
98+
- yarn-packages-{{ checksum "yarn.lock" }}
9999
- run:
100100
name: Install Dependencies
101101
command: yarn install --frozen-lockfile
102102
- save_cache:
103103
name: Save Yarn Package Cache
104-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
104+
key: yarn-packages-{{ checksum "yarn.lock" }}
105105
paths:
106106
- ~/.cache/yarn
107107
- run: yarn test
@@ -110,7 +110,7 @@ jobs:
110110
1);
111111
gally-auto-approve:
112112
docker:
113-
- image: 'circleci/node:14'
113+
- image: circleci/node:14
114114
steps:
115115
- run:
116116
name: Set PR number
@@ -129,7 +129,7 @@ jobs:
129129
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
130130
release:
131131
docker:
132-
- image: 'circleci/node:14'
132+
- image: circleci/node:14
133133
steps:
134134
- checkout
135135
- run:
@@ -146,19 +146,19 @@ jobs:
146146
- restore_cache:
147147
name: Restore Yarn Package Cache
148148
keys:
149-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
149+
- yarn-packages-{{ checksum "yarn.lock" }}
150150
- run:
151151
name: Install Dependencies
152152
command: yarn install --frozen-lockfile
153153
- save_cache:
154154
name: Save Yarn Package Cache
155-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
155+
key: yarn-packages-{{ checksum "yarn.lock" }}
156156
paths:
157157
- ~/.cache/yarn
158158
- run: yarn run semantic-release
159-
test-node-v15:
159+
test-node-v16:
160160
docker:
161-
- image: 'circleci/node:15'
161+
- image: circleci/node:16
162162
steps:
163163
- checkout
164164
- run:
@@ -175,13 +175,13 @@ jobs:
175175
- restore_cache:
176176
name: Restore Yarn Package Cache
177177
keys:
178-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
178+
- yarn-packages-{{ checksum "yarn.lock" }}
179179
- run:
180180
name: Install Dependencies
181181
command: yarn install --frozen-lockfile
182182
- save_cache:
183183
name: Save Yarn Package Cache
184-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
184+
key: yarn-packages-{{ checksum "yarn.lock" }}
185185
paths:
186186
- ~/.cache/yarn
187187
- run: yarn test

.gally.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"strict": true,
2424
"contexts": [
2525
"ci/circleci: gally-create-pr",
26-
"ci/circleci: test-node-v15",
26+
"ci/circleci: test-node-v16",
2727
"ci/circleci: test-node-v14",
2828
"ci/circleci: test-node-v12"
2929
]

package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
"author": "Lukas Siemon",
1010
"license": "MIT",
1111
"devDependencies": {
12-
"@babel/cli": "7.13.10",
13-
"@babel/core": "7.13.10",
14-
"@babel/register": "7.13.8",
12+
"@babel/cli": "7.14.8",
13+
"@babel/core": "7.15.0",
14+
"@babel/register": "7.15.3",
1515
"@blackflux/eslint-plugin-rules": "2.0.3",
16-
"@blackflux/robo-config-plugin": "5.0.0",
16+
"@blackflux/robo-config-plugin": "5.3.0",
1717
"babel-eslint": "10.1.0",
1818
"babel-preset-latest-node": "5.5.1",
1919
"chai": "4.3.4",
20-
"coveralls": "3.1.0",
21-
"eslint": "7.22.0",
20+
"coveralls": "3.1.1",
21+
"eslint": "7.32.0",
2222
"eslint-config-airbnb-base": "14.2.1",
23-
"eslint-plugin-import": "2.22.1",
24-
"eslint-plugin-json": "2.1.2",
25-
"eslint-plugin-markdown": "2.0.0",
26-
"eslint-plugin-mocha": "8.1.0",
23+
"eslint-plugin-import": "2.24.2",
24+
"eslint-plugin-json": "3.1.0",
25+
"eslint-plugin-markdown": "2.2.0",
26+
"eslint-plugin-mocha": "9.0.0",
2727
"js-gardener": "3.0.3",
2828
"lodash.clonedeep": "4.5.0",
2929
"lodash.samplesize": "4.2.0",
3030
"node-tdd": "3.0.4",
3131
"nyc": "15.1.0",
32-
"semantic-release": "17.4.2"
32+
"semantic-release": "17.4.7"
3333
},
3434
"licenses": [
3535
{
@@ -110,6 +110,6 @@
110110
"node": ">= 12"
111111
},
112112
"dependencies": {
113-
"object-scan": "14.0.0"
113+
"object-scan": "17.0.0"
114114
}
115115
}

0 commit comments

Comments
 (0)