Skip to content

Commit b775b64

Browse files
authored
202210-3 (#110)
* Updating ci.yml should run CI * Failed cypress should upload artifacts * Bump nx * Pin and refresh yarn.lock * Ignore patches in renovate PRs
1 parent aa0d3fd commit b775b64

5 files changed

Lines changed: 1628 additions & 2756 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,20 @@ jobs:
7272
- name: Test - Unit
7373
run: yarn nx test main
7474

75-
- name: Test - e2e
76-
run: |
77-
yarn nx run main-e2e:setup:prod
78-
yarn nx run main-e2e:run:docker
79-
yarn nx run main-e2e:teardown
75+
- name: Test - e2e - Setup
76+
run: yarn nx run main-e2e:setup:prod
77+
78+
- name: Test - e2e - Run
79+
id: test-main-e2e-run
80+
run: yarn nx run main-e2e:run:docker
81+
82+
- name: Upload failed e2e artifacts
83+
if: failure()
84+
uses: actions/upload-artifact@v3
85+
with:
86+
name: main-e2e-cypress-artifacts
87+
path: dist/cypress
88+
89+
- name: Test - e2e - Teardown
90+
if: always()
91+
run: yarn nx run main-e2e:teardown

nx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"dependencies": "*",
1313
"devDependencies": "*"
1414
},
15-
".eslintrc.json": "*"
15+
".eslintrc.json": "*",
16+
".github/workflows/ci.yml": "*"
1617
},
1718
"tasksRunnerOptions": {
1819
"default": {

package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
"@envelop/core": "2.6.0",
1515
"@envelop/disable-introspection": "3.6.0",
1616
"@graphql-yoga/node": "2.13.13",
17-
"@nrwl/next": "14.6.5",
17+
"@nrwl/next": "14.7.11",
1818
"@prisma/client": "4.3.1",
1919
"core-js": "^3.6.5",
20-
"graphql": "16.5.0",
21-
"next": "12.2.5",
20+
"graphql": "16.6.0",
21+
"next": "12.3.1",
2222
"react": "18.2.0",
2323
"react-dom": "18.2.0",
2424
"regenerator-runtime": "0.13.9",
2525
"tslib": "2.4.0"
2626
},
2727
"devDependencies": {
28-
"@babel/core": "7.19.0",
29-
"@eddeee888/nx-dev-tools": "0.0.6",
28+
"@babel/core": "7.19.1",
29+
"@eddeee888/nx-dev-tools": "0.0.7",
3030
"@eddeee888/nx-graphql-code-generator": "0.0.14",
3131
"@emotion/babel-plugin": "11.10.0",
3232
"@graphql-codegen/add": "3.2.1",
33-
"@graphql-codegen/cli": "2.12.0",
33+
"@graphql-codegen/cli": "2.12.1",
3434
"@graphql-codegen/fragment-matcher": "3.3.1",
3535
"@graphql-codegen/near-operation-file-preset": "2.4.1",
3636
"@graphql-codegen/typescript": "2.7.3",
@@ -40,41 +40,41 @@
4040
"@graphql-eslint/eslint-plugin": "3.10.7",
4141
"@graphql-tools/load-files": "6.6.1",
4242
"@graphql-tools/merge": "8.3.6",
43-
"@nrwl/cypress": "14.6.5",
44-
"@nrwl/eslint-plugin-nx": "14.6.5",
45-
"@nrwl/jest": "14.6.5",
46-
"@nrwl/linter": "14.6.5",
47-
"@nrwl/node": "14.6.5",
48-
"@nrwl/react": "14.6.5",
49-
"@nrwl/web": "14.6.5",
50-
"@nrwl/workspace": "14.6.5",
51-
"@testing-library/jest-dom": "5.16.4",
43+
"@nrwl/cypress": "14.7.11",
44+
"@nrwl/eslint-plugin-nx": "14.7.11",
45+
"@nrwl/jest": "14.7.11",
46+
"@nrwl/linter": "14.7.11",
47+
"@nrwl/node": "14.7.11",
48+
"@nrwl/react": "14.7.11",
49+
"@nrwl/web": "14.7.11",
50+
"@nrwl/workspace": "14.7.11",
51+
"@testing-library/jest-dom": "5.16.5",
5252
"@testing-library/react": "13.4.0",
5353
"@types/jest": "28.1.8",
54-
"@types/node": "18.7.14",
55-
"@types/react": "18.0.18",
54+
"@types/node": "18.7.18",
55+
"@types/react": "18.0.20",
5656
"@types/react-dom": "18.0.3",
5757
"@typescript-eslint/eslint-plugin": "5.33.1",
5858
"@typescript-eslint/parser": "5.33.1",
5959
"babel-jest": "28.1.3",
6060
"cypress": "10.7.0",
6161
"env-cmd": "10.1.0",
62-
"eslint": "~8.12.0",
63-
"eslint-config-next": "12.2.5",
62+
"eslint": "8.23.1",
63+
"eslint-config-next": "12.3.1",
6464
"eslint-config-prettier": "8.1.0",
6565
"eslint-plugin-cypress": "2.10.3",
6666
"eslint-plugin-import": "2.26.0",
6767
"eslint-plugin-jsx-a11y": "6.6.1",
68-
"eslint-plugin-react": "7.31.1",
68+
"eslint-plugin-react": "7.31.8",
6969
"eslint-plugin-react-hooks": "4.6.0",
7070
"jest": "28.1.3",
7171
"jest-environment-jsdom": "29.0.3",
72-
"nx": "14.6.5",
72+
"nx": "14.7.11",
7373
"prettier": "2.5.1",
7474
"prisma": "4.3.1",
7575
"react-test-renderer": "18.2.0",
7676
"ts-jest": "28.0.8",
7777
"ts-node": "10.9.1",
78-
"typescript": "~4.6.2"
78+
"typescript": "4.8.3"
7979
}
8080
}

renovate.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626
"ts-jest",
2727
"ts-node",
2828
"typescript"
29-
]
29+
],
30+
"patch": {
31+
"enabled": false
32+
}
3033
}

0 commit comments

Comments
 (0)