Skip to content

Commit 87ae6be

Browse files
committed
ci: Debug ci
1 parent 2df59a3 commit 87ae6be

File tree

7 files changed

+54
-6
lines changed

7 files changed

+54
-6
lines changed

.eslintrc.base.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"root": true,
3+
"ignorePatterns": ["**/*"],
4+
"plugins": ["@nx"],
5+
"overrides": [
6+
{
7+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
8+
"rules": {
9+
"@nx/enforce-module-boundaries": [
10+
"error",
11+
{
12+
"enforceBuildableLibDependency": true,
13+
"allow": [],
14+
"depConstraints": [
15+
{
16+
"sourceTag": "*",
17+
"onlyDependOnLibsWithTags": ["*"]
18+
}
19+
]
20+
}
21+
]
22+
}
23+
},
24+
{
25+
"files": ["*.ts", "*.tsx"],
26+
"extends": ["plugin:@nx/typescript"],
27+
"rules": {}
28+
},
29+
{
30+
"files": ["*.js", "*.jsx"],
31+
"extends": ["plugin:@nx/javascript"],
32+
"rules": {}
33+
},
34+
{
35+
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
36+
"env": {
37+
"jest": true
38+
},
39+
"rules": {}
40+
}
41+
]
42+
}

.github/workflows/bump-version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fetch-depth: 0
1616
- name: Npm install
1717
uses: ./.github/actions
18-
- run: npx nx affected -t lint test build --parallel=3 --exclude='json-api-front,json-api-server,json-api-server-e2e,shared-utils,json-shared-type,database,@nestjs-json-api/source'
18+
- run: npx nx affected -t lint test build --parallel=3 --exclude='json-api-front,json-api-server,json-api-server-e2e,shared-utils,json-shared-type,database,@nestjs-json-api/source' --base=origin/master~1 --head=origin/master
1919
# - run: npm nx affected -t e2e-ci --parallel=1
2020
# - run: npm nx affected -t deploy --no-agents
2121

@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
git config user.name 'Alex H'
4646
git config user.email '[email protected]'
47-
npx nx release --skip-publish
47+
npx nx release --skip-publish --dry-run
4848
shell: bash
4949
env:
5050
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Npm install
1717
uses: ./.github/actions
1818
# This line is needed for nx affected to work when CI is running on a PR
19-
- run: git branch --track main origin/main
19+
- run: git branch --track main origin/master
2020
- run: npx nx affected -t lint test build --parallel=3 --exclude='json-api-front,json-api-server,json-api-server-e2e,shared-utils,json-shared-type,database'
2121
# - run: npm nx affected -t e2e-ci --parallel=1
2222
# - run: npm nx affected -t deploy --no-agents

libs/json-api/json-api-nestjs-sdk/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": ["../../../.eslintrc.json"],
3-
"ignorePatterns": ["!**/*"],
3+
"ignorePatterns": ["!**/*", "**/*.spec.ts"],
44
"overrides": [
55
{
66
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

libs/json-api/json-api-nestjs-sdk/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"executor": "@nx/jest:jest",
6767
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
6868
"options": {
69-
"jestConfig": "libs/json-api/json-api-nestjs/jest.config.ts"
69+
"jestConfig": "libs/json-api/json-api-nestjs-sdk/jest.config.ts"
7070
}
7171
}
7272
},

libs/shared-utils/project.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
"main": "libs/shared-utils/src/index.ts",
1515
"assets": ["libs/shared-utils/*.md"]
1616
}
17+
},
18+
"test": {
19+
"executor": "@nx/jest:jest",
20+
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
21+
"options": {
22+
"jestConfig": "libs/shared-utils/jest.config.ts"
23+
}
1724
}
1825
},
1926
"tags": []

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {
6-
"test": "nx test",
76
"typeorm": "ts-node -r tsconfig-paths/register --project libs/database/tsconfig.lib.json ./node_modules/typeorm/cli.js -d libs/database/src/lib/config-cli.ts",
87
"typeorm:run": "npm run typeorm migration:run",
98
"typeorm:revert": "npm run typeorm migration:revert",

0 commit comments

Comments
 (0)