Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

Commit 0ad620c

Browse files
committed
Combined build tasks
1 parent 2b95f97 commit 0ad620c

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.circleci/config.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 2.1
66
jobs:
77
build:
88
docker:
9-
- image: circleci/node:10-jessie
9+
- image: circleci/node:lts-buster
1010

1111
working_directory: ~/repo
1212

@@ -16,27 +16,23 @@ jobs:
1616
- restore_cache:
1717
name: Restore Yarn package cache
1818
keys:
19-
- v1-dependencies-{{ checksum "yarn.lock" }}
19+
- v2-dependencies-{{ checksum "yarn.lock" }}
2020
# fallback to using the latest cache if no exact match is found
21-
- v1-dependencies-
21+
- v2-dependencies-
2222

2323
- run:
2424
name: Install dependencies
2525
command: yarn install
2626

2727
- save_cache:
2828
name: Save Yarn package cache
29-
key: v1-dependencies-{{ checksum "yarn.lock" }}
29+
key: v2-dependencies-{{ checksum "yarn.lock" }}
3030
paths:
3131
- ~/.cache/yarn
3232

3333
- run:
3434
name: Build the project
35-
command: yarn build
36-
37-
- run:
38-
name: Run tests
39-
command: yarn test --ci --runInBand
35+
command: yarn ci:all
4036

4137
- store_artifacts:
4238
name: Store test results
@@ -56,10 +52,6 @@ jobs:
5652
name: Upload code coverage report
5753
command: yarn codecov --disable=gcov
5854

59-
- run:
60-
name: Linting
61-
command: yarn lint
62-
6355
workflows:
6456
version: 2.1
6557
build:

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@
4444
"typescript": "^3.6.2"
4545
},
4646
"scripts": {
47+
"all": "run-p rebuild lint test",
4748
"build": "rollup --config ./rollup.config.js",
49+
"ci:all": "run-p build lint ci:test",
50+
"ci:test": "jest --ci --runInBand",
4851
"clean": "node ./build/clean",
4952
"doc": "typedoc",
5053
"doc:gh-pages": "gh-pages --dist target/typedoc --dotfiles",
5154
"doc:ci": "node ./build/doc-ci",
5255
"doc:publish": "run-s doc doc:ci \"doc:gh-pages {@}\" --",
5356
"lint": "tslint --project .",
57+
"rebuild": "run-s clean build",
5458
"test": "jest"
5559
}
5660
}

0 commit comments

Comments
 (0)