Skip to content

Commit 5e0bdb1

Browse files
authored
Chore: Update CI (#10)
1 parent a9a93c6 commit 5e0bdb1

File tree

4 files changed

+26
-76
lines changed

4 files changed

+26
-76
lines changed

.github/workflows/integration.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,18 @@ jobs:
44
ci:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
7+
- uses: actions/checkout@v3
88
with:
99
fetch-depth: 0
10-
1110
- name: Cache node modules
12-
uses: actions/cache@v2
11+
uses: actions/cache@v3
1312
env:
1413
cache-name: cache-node-modules
1514
with:
1615
# npm cache files are stored in `~/.npm` on Linux/macOS
1716
path: ~/.npm
1817
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
19-
restore-keys: |
20-
${{ runner.os }}-build-${{ env.cache-name }}-
21-
${{ runner.os }}-build-
22-
${{ runner.os }}-
18+
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-
2319

2420
- name: Install Dependencies
2521
run: npm i

nx.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
"default": {
1515
"runner": "@nrwl/workspace/tasks-runners/default",
1616
"options": {
17-
"cacheableOperations": [
18-
"build",
19-
"lint",
20-
"test",
21-
"e2e"
22-
]
17+
"cacheableOperations": ["build", "lint", "test", "e2e"]
2318
}
2419
}
2520
},
@@ -33,25 +28,17 @@
3328
},
3429
"projects": {
3530
"api": {
36-
"tags": [
37-
"backend"
38-
]
31+
"tags": ["backend"]
3932
},
4033
"client": {
41-
"tags": [
42-
"frontend"
43-
]
34+
"tags": ["frontend"]
4435
},
4536
"client-e2e": {
46-
"tags": [
47-
"end-2-end-tests"
48-
],
49-
"implicitDependencies": [
50-
"client"
51-
]
37+
"tags": ["end-2-end-tests"],
38+
"implicitDependencies": ["client"]
5239
},
5340
"types": {
5441
"tags": ["module"]
5542
}
5643
}
57-
}
44+
}

tsconfig.base.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,13 @@
1010
"importHelpers": true,
1111
"target": "es2015",
1212
"module": "esnext",
13-
"lib": [
14-
"es2017",
15-
"dom"
16-
],
13+
"lib": ["es2017", "dom"],
1714
"skipLibCheck": true,
1815
"skipDefaultLibCheck": true,
1916
"baseUrl": ".",
2017
"paths": {
21-
"@types": [
22-
"libs/types/src/index.ts"
23-
]
18+
"@types": ["libs/types/src/index.ts"]
2419
}
2520
},
26-
"exclude": [
27-
"node_modules",
28-
"tmp"
29-
]
30-
}
21+
"exclude": ["node_modules", "tmp"]
22+
}

workspace.json

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
"targets": {
99
"build": {
1010
"executor": "@nrwl/node:build",
11-
"outputs": [
12-
"{options.outputPath}"
13-
],
11+
"outputs": ["{options.outputPath}"],
1412
"options": {
1513
"outputPath": "dist/apps/api",
1614
"main": "apps/api/src/main.ts",
1715
"tsConfig": "apps/api/tsconfig.app.json",
18-
"assets": [
19-
"apps/api/src/assets"
20-
]
16+
"assets": ["apps/api/src/assets"]
2117
},
2218
"configurations": {
2319
"production": {
@@ -42,16 +38,12 @@
4238
"lint": {
4339
"executor": "@nrwl/linter:eslint",
4440
"options": {
45-
"lintFilePatterns": [
46-
"apps/api/**/*.ts"
47-
]
41+
"lintFilePatterns": ["apps/api/**/*.ts"]
4842
}
4943
},
5044
"test": {
5145
"executor": "@nrwl/jest:jest",
52-
"outputs": [
53-
"coverage/apps/api"
54-
],
46+
"outputs": ["coverage/apps/api"],
5547
"options": {
5648
"jestConfig": "apps/api/jest.config.js",
5749
"passWithNoTests": true
@@ -66,22 +58,15 @@
6658
"targets": {
6759
"build": {
6860
"executor": "@nrwl/web:build",
69-
"outputs": [
70-
"{options.outputPath}"
71-
],
61+
"outputs": ["{options.outputPath}"],
7262
"options": {
7363
"outputPath": "dist/apps/client",
7464
"index": "apps/client/src/index.html",
7565
"main": "apps/client/src/main.tsx",
7666
"polyfills": "apps/client/src/polyfills.ts",
7767
"tsConfig": "apps/client/tsconfig.app.json",
78-
"assets": [
79-
"apps/client/src/favicon.ico",
80-
"apps/client/src/assets"
81-
],
82-
"styles": [
83-
"apps/client/src/styles.scss"
84-
],
68+
"assets": ["apps/client/src/favicon.ico", "apps/client/src/assets"],
69+
"styles": ["apps/client/src/styles.scss"],
8570
"scripts": [],
8671
"webpackConfig": "@nrwl/react/plugins/webpack"
8772
},
@@ -127,16 +112,12 @@
127112
"lint": {
128113
"executor": "@nrwl/linter:eslint",
129114
"options": {
130-
"lintFilePatterns": [
131-
"apps/client/**/*.{ts,tsx,js,jsx}"
132-
]
115+
"lintFilePatterns": ["apps/client/**/*.{ts,tsx,js,jsx}"]
133116
}
134117
},
135118
"test": {
136119
"executor": "@nrwl/jest:jest",
137-
"outputs": [
138-
"coverage/apps/client"
139-
],
120+
"outputs": ["coverage/apps/client"],
140121
"options": {
141122
"jestConfig": "apps/client/jest.config.js",
142123
"passWithNoTests": true
@@ -165,9 +146,7 @@
165146
"lint": {
166147
"executor": "@nrwl/linter:eslint",
167148
"options": {
168-
"lintFilePatterns": [
169-
"apps/client-e2e/**/*.{js,ts}"
170-
]
149+
"lintFilePatterns": ["apps/client-e2e/**/*.{js,ts}"]
171150
}
172151
}
173152
}
@@ -180,16 +159,12 @@
180159
"lint": {
181160
"executor": "@nrwl/linter:eslint",
182161
"options": {
183-
"lintFilePatterns": [
184-
"libs/types/**/*.ts"
185-
]
162+
"lintFilePatterns": ["libs/types/**/*.ts"]
186163
}
187164
},
188165
"test": {
189166
"executor": "@nrwl/jest:jest",
190-
"outputs": [
191-
"coverage/libs/types"
192-
],
167+
"outputs": ["coverage/libs/types"],
193168
"options": {
194169
"jestConfig": "libs/types/jest.config.js",
195170
"passWithNoTests": true
@@ -218,4 +193,4 @@
218193
}
219194
},
220195
"defaultProject": "client"
221-
}
196+
}

0 commit comments

Comments
 (0)