Skip to content

Commit 29b00b5

Browse files
authored
Merge pull request #199 from w3bdesign/development
Version 1.0.2
2 parents 130edb8 + b9ef825 commit 29b00b5

File tree

5 files changed

+1172
-1161
lines changed

5 files changed

+1172
-1161
lines changed

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,4 @@ workflows:
7575
chromatic-deploy:
7676
jobs:
7777
- build:
78-
name: Build Next.js project
79-
#- cypress/run:
80-
# name: Run Cypress E2E tests with Electron
81-
# cypress-command: npx cypress run --browser electron
82-
# start-command: pnpm run dev
83-
# parallelism: 8
78+
name: Build Next.js project

.github/workflows/cypress.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Cypress Github Action
2+
on: push
3+
jobs:
4+
basic-pnpm:
5+
runs-on: ubuntu-22.04
6+
steps:
7+
- name: Checkout
8+
uses: actions/checkout@v4
9+
- name: Install pnpm
10+
run: npm install -g pnpm@9
11+
- name: Install dependencies
12+
run: pnpm i
13+
- name: Cypress run
14+
uses: cypress-io/github-action@v6
15+
with:
16+
build: pnpm build
17+
start: pnpm dev
18+
wait-on: 'http://localhost:3000'
19+
wait-on-timeout: 120
20+
working-directory: /home/runner/work/dfweb-v4/dfweb-v4

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![Cypress](https://github.com/w3bdesign/dfweb-v4/actions/workflows/cypress.yml/badge.svg)](https://github.com/w3bdesign/dfweb-v4/actions/workflows/cypress.yml)
12
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/3e803ad0f17146b78bbed9850eb1461f)](https://app.codacy.com/gh/w3bdesign/dfweb-v4/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
23
[![codecov](https://codecov.io/gh/w3bdesign/dfweb-v4/graph/badge.svg?token=AHQW8WQ6U8)](https://codecov.io/gh/w3bdesign/dfweb-v4)
34
[![Maintainability](https://api.codeclimate.com/v1/badges/8d5cae5017b1a9698843/maintainability)](https://codeclimate.com/github/w3bdesign/dfweb-v4/maintainability)
@@ -60,7 +61,8 @@ Fourth version of my personal portfolio website with Next.js, Framer Motion, San
6061
### Devops / Code quality
6162

6263
- Continuous Integration with CircleCI
63-
- CircleCI will warn before deploy if tests fail (setup for React testing library, Cypress and Chromatic)
64+
- CircleCI will warn before deploy if tests fail (setup for React testing library)
65+
- Github action workflow for Cypress
6466
- Code quality analysis with Codacy, Sonarcloud and Codeclimate
6567
- E2E testing with Cypress integrated with CircleCI
6668
- E2E testing with Playwright integrated with Github actions

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dfweb-v4",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",
@@ -44,7 +44,7 @@
4444
"axe-core": "^4.9.1",
4545
"cypress": "13.13.1",
4646
"cypress-axe": "^1.5.0",
47-
"eslint": "9.7.0",
47+
"eslint": "8.57.0",
4848
"eslint-config-next": "14.2.5",
4949
"jest-environment-jsdom": "^29.7.0",
5050
"jsdom-testing-mocks": "^1.13.0",

0 commit comments

Comments
 (0)