Skip to content

Commit

Permalink
Merge pull request #199 from w3bdesign/development
Browse files Browse the repository at this point in the history
Version 1.0.2
  • Loading branch information
w3bdesign authored Jul 21, 2024
2 parents 130edb8 + b9ef825 commit 29b00b5
Show file tree
Hide file tree
Showing 5 changed files with 1,172 additions and 1,161 deletions.
7 changes: 1 addition & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,4 @@ workflows:
chromatic-deploy:
jobs:
- build:
name: Build Next.js project
#- cypress/run:
# name: Run Cypress E2E tests with Electron
# cypress-command: npx cypress run --browser electron
# start-command: pnpm run dev
# parallelism: 8
name: Build Next.js project
20 changes: 20 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Cypress Github Action
on: push
jobs:
basic-pnpm:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install pnpm
run: npm install -g pnpm@9
- name: Install dependencies
run: pnpm i
- name: Cypress run
uses: cypress-io/github-action@v6
with:
build: pnpm build
start: pnpm dev
wait-on: 'http://localhost:3000'
wait-on-timeout: 120
working-directory: /home/runner/work/dfweb-v4/dfweb-v4
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![Cypress](https://github.com/w3bdesign/dfweb-v4/actions/workflows/cypress.yml/badge.svg)](https://github.com/w3bdesign/dfweb-v4/actions/workflows/cypress.yml)
[![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)
[![codecov](https://codecov.io/gh/w3bdesign/dfweb-v4/graph/badge.svg?token=AHQW8WQ6U8)](https://codecov.io/gh/w3bdesign/dfweb-v4)
[![Maintainability](https://api.codeclimate.com/v1/badges/8d5cae5017b1a9698843/maintainability)](https://codeclimate.com/github/w3bdesign/dfweb-v4/maintainability)
Expand Down Expand Up @@ -60,7 +61,8 @@ Fourth version of my personal portfolio website with Next.js, Framer Motion, San
### Devops / Code quality

- Continuous Integration with CircleCI
- CircleCI will warn before deploy if tests fail (setup for React testing library, Cypress and Chromatic)
- CircleCI will warn before deploy if tests fail (setup for React testing library)
- Github action workflow for Cypress
- Code quality analysis with Codacy, Sonarcloud and Codeclimate
- E2E testing with Cypress integrated with CircleCI
- E2E testing with Playwright integrated with Github actions
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dfweb-v4",
"version": "1.0.1",
"version": "1.0.2",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down Expand Up @@ -44,7 +44,7 @@
"axe-core": "^4.9.1",
"cypress": "13.13.1",
"cypress-axe": "^1.5.0",
"eslint": "9.7.0",
"eslint": "8.57.0",
"eslint-config-next": "14.2.5",
"jest-environment-jsdom": "^29.7.0",
"jsdom-testing-mocks": "^1.13.0",
Expand Down
Loading

0 comments on commit 29b00b5

Please sign in to comment.