Skip to content

Commit 55f2d2e

Browse files
committed
1 parent 3ef8767 commit 55f2d2e

File tree

199 files changed

+9540
-4807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+9540
-4807
lines changed

.circleci/config.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22
orbs:
33
browser-tools: circleci/[email protected]
44
commitlint: conventional-changelog/[email protected]
5-
node: circleci/node@5.0.2
5+
node: circleci/node@5.1.0
66
aliases:
77
- &save_git_cache
88
save_cache:
@@ -36,16 +36,18 @@ aliases:
3636
save_cache:
3737
paths:
3838
- node_modules
39-
key: v3-npm-{{ checksum "package-lock.json" }}-1
39+
- src/generated
40+
- static/microbit
41+
key: v4-npm-{{ checksum "package-lock.json" }}
4042
- &restore_npm_cache
4143
restore_cache:
4244
keys:
43-
- v3-npm-{{ checksum "package-lock.json" }}-1
44-
- v3-npm-
45+
- v4-npm-{{ checksum "package-lock.json" }}
46+
- v4-npm-
4547
- &defaults
4648
docker:
4749
# TODO: fix scratch-audio and change this to `cimg/node:lts-browsers`
48-
- image: cimg/node:14.20-browsers
50+
- image: cimg/node:14.21-browsers
4951
auth:
5052
username: $DOCKERHUB_USERNAME
5153
password: $DOCKERHUB_PASSWORD
@@ -75,7 +77,7 @@ jobs:
7577
name: Unit
7678
environment:
7779
JEST_JUNIT_OUTPUT_NAME: unit-results.xml
78-
command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="4"
80+
command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="2"
7981
- run:
8082
name: Build
8183
environment:
@@ -93,6 +95,7 @@ jobs:
9395
path: coverage
9496
- store_test_results:
9597
path: test-results
98+
- run: npx --no -- semantic-release --dry-run
9699
setup:
97100
<<: *defaults
98101
environment:
@@ -185,22 +188,6 @@ jobs:
185188
- store_test_results:
186189
path: test-results
187190

188-
deploy-npm:
189-
<<: *defaults
190-
steps:
191-
- *restore_git_cache
192-
- checkout
193-
- *restore_npm_cache
194-
- *restore_dist_cache
195-
- run:
196-
name: adjust config for hotfix if necessary
197-
command: |
198-
# double brackets are important for matching the wildcard
199-
if [[ "$CIRCLE_BRANCH" == hotfix/* ]]; then
200-
sed -e "s|hotfix/REPLACE|${CIRCLE_BRANCH}|" --in-place release.config.js
201-
fi
202-
- run: npx semantic-release
203-
204191
deploy-gh-pages:
205192
<<: *defaults
206193
steps:
@@ -225,8 +212,8 @@ workflows:
225212
ignore:
226213
- master
227214
- develop
215+
- beta
228216
- /^hotfix\/.*/
229-
230217
build-test-no-deploy:
231218
jobs:
232219
- build-test-no-cache:
@@ -237,6 +224,7 @@ workflows:
237224
ignore:
238225
- master
239226
- develop
227+
- beta
240228
- /^hotfix\/.*/
241229
build-test-deploy:
242230
jobs:
@@ -248,6 +236,7 @@ workflows:
248236
only:
249237
- master
250238
- develop
239+
- beta
251240
- /^hotfix\/.*/
252241
- lint:
253242
context:
@@ -279,6 +268,7 @@ workflows:
279268
only:
280269
- master
281270
- develop
271+
- beta
282272
- /^hotfix\/.*/
283273
- store_dist:
284274
context:
@@ -290,6 +280,7 @@ workflows:
290280
only:
291281
- master
292282
- develop
283+
- beta
293284
- /^hotfix\/.*/
294285
- deploy-gh-pages:
295286
context:

.eslintrc.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
module.exports = {
2-
extends: ['scratch', 'scratch/node'],
3-
rules: {
4-
'no-warning-comments': [0, {
5-
terms: ['todo'],
6-
location: 'start'
7-
}]
8-
}
2+
extends: ['scratch', 'scratch/node', 'scratch/es6']
93
};

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,9 @@ npm-*
1717
# Generated translation files
1818
/translations
1919
/locale
20+
21+
# Other generated source
22+
/src/generated
23+
24+
# Downloaded during "npm install"
25+
/static/microbit

0 commit comments

Comments
 (0)