Skip to content

Commit 563969b

Browse files
simlusimlu
authored
Merge pull request #1770 from blackflux/dev
[Gally]: master <- dev
2 parents 6c46f5f + 793774c commit 563969b

4 files changed

Lines changed: 1029 additions & 582 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 18 additions & 18 deletions
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
release:
4343
docker:
44-
- image: 'circleci/node:14'
44+
- image: circleci/node:14
4545
steps:
4646
- checkout
4747
- run:
@@ -58,19 +58,19 @@ 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 run semantic-release
7171
test-node-v12:
7272
docker:
73-
- image: 'circleci/node:12'
73+
- image: circleci/node:12
7474
steps:
7575
- checkout
7676
- run:
@@ -87,13 +87,13 @@ jobs:
8787
- restore_cache:
8888
name: Restore Yarn Package Cache
8989
keys:
90-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
90+
- yarn-packages-{{ checksum "yarn.lock" }}
9191
- run:
9292
name: Install Dependencies
9393
command: yarn install --frozen-lockfile
9494
- save_cache:
9595
name: Save Yarn Package Cache
96-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
96+
key: yarn-packages-{{ checksum "yarn.lock" }}
9797
paths:
9898
- ~/.cache/yarn
9999
- run: yarn test
@@ -102,7 +102,7 @@ jobs:
102102
1);
103103
gally-auto-approve:
104104
docker:
105-
- image: 'circleci/node:14'
105+
- image: circleci/node:14
106106
steps:
107107
- run:
108108
name: Set PR number
@@ -121,7 +121,7 @@ jobs:
121121
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
122122
test-node-v14:
123123
docker:
124-
- image: 'circleci/node:14'
124+
- image: circleci/node:14
125125
steps:
126126
- checkout
127127
- run:
@@ -138,13 +138,13 @@ jobs:
138138
- restore_cache:
139139
name: Restore Yarn Package Cache
140140
keys:
141-
- 'yarn-packages-{{ checksum "yarn.lock" }}'
141+
- yarn-packages-{{ checksum "yarn.lock" }}
142142
- run:
143143
name: Install Dependencies
144144
command: yarn install --frozen-lockfile
145145
- save_cache:
146146
name: Save Yarn Package Cache
147-
key: 'yarn-packages-{{ checksum "yarn.lock" }}'
147+
key: yarn-packages-{{ checksum "yarn.lock" }}
148148
paths:
149149
- ~/.cache/yarn
150150
- run: yarn test
@@ -156,9 +156,9 @@ jobs:
156156
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
157157
yarn run coveralls
158158
fi
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@
3131
},
3232
"homepage": "https://github.com/blackflux/lambda-example#readme",
3333
"devDependencies": {
34-
"@babel/cli": "7.13.10",
35-
"@babel/core": "7.13.10",
36-
"@babel/register": "7.13.8",
34+
"@babel/cli": "7.14.8",
35+
"@babel/core": "7.15.0",
36+
"@babel/register": "7.15.3",
3737
"@blackflux/eslint-plugin-rules": "2.0.3",
38-
"@blackflux/robo-config-plugin": "5.0.0",
38+
"@blackflux/robo-config-plugin": "5.3.0",
3939
"babel-eslint": "10.1.0",
4040
"babel-preset-latest-node": "5.5.1",
4141
"chai": "4.3.4",
42-
"coveralls": "3.1.0",
43-
"eslint": "7.22.0",
42+
"coveralls": "3.1.1",
43+
"eslint": "7.32.0",
4444
"eslint-config-airbnb-base": "14.2.1",
45-
"eslint-plugin-import": "2.22.1",
46-
"eslint-plugin-json": "2.1.2",
47-
"eslint-plugin-markdown": "2.0.0",
48-
"eslint-plugin-mocha": "8.1.0",
45+
"eslint-plugin-import": "2.24.2",
46+
"eslint-plugin-json": "3.1.0",
47+
"eslint-plugin-markdown": "2.2.0",
48+
"eslint-plugin-mocha": "9.0.0",
4949
"js-gardener": "3.0.3",
5050
"lambda-tdd": "3.0.6",
51-
"mocha": "8.3.2",
52-
"nock": "13.0.11",
51+
"mocha": "9.1.1",
52+
"nock": "13.1.3",
5353
"nyc": "15.1.0",
54-
"semantic-release": "17.4.2",
54+
"semantic-release": "17.4.7",
5555
"smart-fs": "2.0.2"
5656
},
5757
"licenses": [
@@ -69,7 +69,7 @@
6969
"dependencies": {
7070
"lambda-async": "2.0.0",
7171
"lambda-monitor-logger": "3.0.0",
72-
"lambda-serverless-api": "8.0.7",
72+
"lambda-serverless-api": "9.1.1",
7373
"moment-timezone": "0.5.33",
7474
"request": "2.88.2"
7575
},

0 commit comments

Comments
 (0)