Skip to content

Commit

Permalink
Merge pull request #1494 from mozzy11/develop
Browse files Browse the repository at this point in the history
Add XML formatter and VAlidate frontEnd Format in CI
  • Loading branch information
mozzy11 authored Feb 3, 2025
2 parents 3a1e57c + b77f877 commit 42fd99c
Show file tree
Hide file tree
Showing 141 changed files with 6,046 additions and 5,854 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/frontend-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,10 @@ jobs:
repository: ${{github.repository}}
submodules: recursive

- name: Run OpenELIS image
run: docker compose -f build.docker-compose.yml up -d --build --wait --wait-timeout 600

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 20

- name: Install dependencies
run: npm install
Expand All @@ -64,6 +61,13 @@ jobs:
run: npm install [email protected] -g
working-directory: frontend

- name: Check Format
run: npx prettier ./ --check
working-directory: frontend

- name: Build OpenELIS Images and Run containers
run: docker compose -f build.docker-compose.yml up -d --build --wait --wait-timeout 600

- name: Run Frontend Qa Workflow
run: npx cypress run –headless
working-directory: frontend
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ src/main/resources/adminPassword.txt
*/plugins/*.jar
Patient/*
volume/*
tools/Liquibase-Outdated
5 changes: 3 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"geopattern": "1.2.3",
"jsonpath": "^1.1.1",
"lodash-es": "^4.17.15",
"prettier-eslint": "^15.0.1",
"prettier-eslint": "15.0.1",
"qs": "6.11.0",
"react": "^17.0.2",
"react-avatar": "5.0.3",
Expand Down Expand Up @@ -55,7 +55,8 @@
"eject": "react-scripts eject",
"cy:run": "cypress run --headless --browser chrome",
"cy:open": "cypress open --browser chrome",
"format": "prettier ./ --write"
"format": "prettier ./ --write",
"check-format": "prettier ./ --check"
},
"eslintConfig": {
"extends": [
Expand Down
Loading

0 comments on commit 42fd99c

Please sign in to comment.