Skip to content

Commit 4340966

Browse files
authored
Merge pull request #2309 from blackflux/dev
[Gally]: master <- dev
2 parents 5c7aaa9 + eebb44a commit 4340966

27 files changed

+3723
-6852
lines changed

.babelrc

-5
This file was deleted.

.c8rc.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"exclude": [
3+
"gardener.js",
4+
"node_modules/*",
5+
"coverage/*",
6+
"lib/*",
7+
"test/hot.js"
8+
],
9+
"temp-directory": "./coverage/.c8_output",
10+
"reports-dir": "./coverage",
11+
"check-coverage": true,
12+
"per-file": false,
13+
"lines": 100,
14+
"statements": 100,
15+
"functions": 100,
16+
"branches": 100,
17+
"include": [
18+
"**/*.js"
19+
],
20+
"reporter": [
21+
"lcov",
22+
"text-summary"
23+
],
24+
"extension": {},
25+
"all": true,
26+
"skip-full": true,
27+
"clean": true
28+
}

.circleci/config.yml

+35-39
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@ workflows:
33
node-multi-build:
44
jobs:
55
- gally-create-pr
6-
- test-node-v16:
6+
- test-node-v18:
77
requires:
88
- gally-create-pr
9-
- test-node-v14:
9+
- test-node-v16:
1010
requires:
1111
- gally-create-pr
12-
- test-node-v12:
12+
- test-node-v20:
1313
requires:
1414
- gally-create-pr
1515
- gally-auto-approve:
1616
requires:
1717
- gally-create-pr
18+
- test-node-v18
1819
- test-node-v16
19-
- test-node-v14
20-
- test-node-v12
20+
- test-node-v20
2121
filters:
2222
branches:
2323
only: /dependabot\/.*/
2424
- release:
2525
requires:
2626
- gally-create-pr
27+
- test-node-v18
2728
- test-node-v16
28-
- test-node-v14
29-
- test-node-v12
29+
- test-node-v20
3030
filters:
3131
branches:
3232
only: master
3333
version: 2
3434
jobs:
3535
gally-create-pr:
3636
docker:
37-
- image: circleci/node:14
37+
- image: cimg/node:16.20
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: cimg/node:16.20
4545
steps:
4646
- checkout
4747
- run:
@@ -67,10 +67,30 @@ jobs:
6767
key: yarn-packages-{{ checksum "yarn.lock" }}
6868
paths:
6969
- ~/.cache/yarn
70+
- run: yarn global add "semantic-release@^19.0.5"
7071
- run: yarn run semantic-release
71-
test-node-v12:
72+
gally-auto-approve:
73+
docker:
74+
- image: cimg/node:16.20
75+
steps:
76+
- run:
77+
name: Set PR number
78+
command: >
79+
echo 'export
80+
CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
81+
>> $BASH_ENV
82+
83+
source $BASH_ENV
84+
85+
echo $CIRCLE_PR_NUMBER
86+
- checkout
87+
- run: sudo yarn global add gally
88+
- run: >-
89+
ga approve $CIRCLE_PR_NUMBER --condition
90+
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
91+
test-node-v16:
7292
docker:
73-
- image: circleci/node:12
93+
- image: cimg/node:16.20
7494
steps:
7595
- checkout
7696
- run:
@@ -100,28 +120,9 @@ jobs:
100120
- run: >-
101121
(git add . && git diff-index --quiet HEAD --) || (git status && exit
102122
1);
103-
gally-auto-approve:
123+
test-node-v18:
104124
docker:
105-
- image: circleci/node:14
106-
steps:
107-
- run:
108-
name: Set PR number
109-
command: >
110-
echo 'export
111-
CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"'
112-
>> $BASH_ENV
113-
114-
source $BASH_ENV
115-
116-
echo $CIRCLE_PR_NUMBER
117-
- checkout
118-
- run: sudo yarn global add gally
119-
- run: >-
120-
ga approve $CIRCLE_PR_NUMBER --condition
121-
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
122-
test-node-v14:
123-
docker:
124-
- image: circleci/node:14
125+
- image: cimg/node:18.16
125126
steps:
126127
- checkout
127128
- run:
@@ -151,14 +152,9 @@ jobs:
151152
- run: >-
152153
(git add . && git diff-index --quiet HEAD --) || (git status && exit
153154
1);
154-
- run:
155-
command: |
156-
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
157-
yarn run coveralls
158-
fi
159-
test-node-v16:
155+
test-node-v20:
160156
docker:
161-
- image: circleci/node:16
157+
- image: cimg/node:20.4
162158
steps:
163159
- checkout
164160
- run:

.eslintrc.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"plugin:markdown/recommended"
77
],
88
"rules": {
9-
"@blackflux/rules/istanbul-prevent-ignore": 1,
9+
"@blackflux/rules/c8-prevent-ignore": 1,
1010
"@blackflux/rules/kebab-case-enforce": 1,
1111
"max-len": ["error", {"code": 120}],
1212
"mocha/no-exclusive-tests": "error",
@@ -37,10 +37,13 @@
3737
"@blackflux/rules/prevent-typeof-object": 1,
3838
"mocha/no-mocha-arrows": 0,
3939
"mocha/no-hooks-for-single-case": 0,
40-
"import/no-useless-path-segments": [2, {"commonjs": true}]
40+
"import/no-useless-path-segments": [2, {"commonjs": true}],
41+
"import/extensions": [2, "always"],
42+
"import/prefer-default-export": 0
4143
},
4244
"env": {"es6": true, "node": true, "mocha": true},
4345
"globals": {},
4446
"plugins": ["json", "mocha", "@blackflux/rules"],
45-
"parser": "babel-eslint"
47+
"parser": "@babel/eslint-parser",
48+
"parserOptions": {"requireConfigFile": false}
4649
}

.gally.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"strict": true,
2424
"contexts": [
2525
"ci/circleci: gally-create-pr",
26+
"ci/circleci: test-node-v18",
2627
"ci/circleci: test-node-v16",
27-
"ci/circleci: test-node-v14",
28-
"ci/circleci: test-node-v12"
28+
"ci/circleci: test-node-v20"
2929
]
3030
},
31-
"enforce_admins": true,
31+
"enforce_admins": false,
3232
"required_pull_request_reviews": {
3333
"dismissal_restrictions": {"users": ["simlu"], "teams": []},
3434
"dismiss_stale_reviews": true,

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ yarn-error.log
8181

8282
# JS-Gardener Specific
8383
coverage/
84-
.coveralls.yml
8584
lib/
8685

8786
# ----------------------------------------

.roboconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"owner": "simlu",
1111
"nodeVersion": "12",
1212
"ownerName": "Lukas Siemon",
13-
"mergeBot": "MrsFlux"
13+
"mergeBot": "MrsFlux",
14+
"nccEnabled": false
1415
}
1516
}
1617
}

.roboconfig.lock

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@blackflux/robo-config-plugin": [
3-
".babelrc",
3+
".c8rc.json",
44
".circleci/config.yml",
55
".dependabot/config.yml",
66
".editorconfig",
@@ -16,6 +16,7 @@
1616
"gardener.js",
1717
"package.json",
1818
"src/index.js",
19+
"test/hot.js",
1920
"test/index.spec.js"
2021
]
2122
}

0 commit comments

Comments
 (0)