Skip to content

Commit

Permalink
Merge pull request #1551 from UK-Export-Finance/fix/EMS-2463-dependab…
Browse files Browse the repository at this point in the history
…ot-test-failure

fix(EMS-2463): `ci:all` execution
  • Loading branch information
abhi-markan authored Dec 20, 2023
2 parents 57c532c + 10c0a9a commit 2208aca
Show file tree
Hide file tree
Showing 5 changed files with 144 additions and 133 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ jobs:
with:
node-version: ${{ vars.NODE_VERSION }}

- name: Dependencies
working-directory: ./
run: npm run ci:all

- name: UI
working-directory: ./src/ui
env:
Expand All @@ -97,9 +101,7 @@ jobs:
GOV_NOTIFY_EMAIL_RECIPIENT_1: ${{ secrets.GOV_NOTIFY_EMAIL_RECIPIENT_1 }}
GOV_NOTIFY_EMAIL_RECIPIENT_2: ${{ secrets.GOV_NOTIFY_EMAIL_RECIPIENT_2 }}
MOCK_ACCOUNT_PASSWORD: ${{ secrets.MOCK_ACCOUNT_PASSWORD }}
run: |
npm ci --legacy-peer-deps
npm run test
run: npm run test

# 3. API - API test cases
api-tests:
Expand Down Expand Up @@ -127,6 +129,10 @@ jobs:
with:
node-version: ${{ vars.NODE_VERSION }}

- name: Dependencies
working-directory: ./
run: npm run ci:all

- name: API
working-directory: ./
env:
Expand Down Expand Up @@ -156,7 +162,6 @@ jobs:
JWT_SIGNING_KEY: ${{ secrets.JWT_SIGNING_KEY }}
run: |
docker-compose up --build -d
npm ci --legacy-peer-deps --prefix ./src/api
npm run test --prefix ./src/api
# 4. E2E - Insurance
Expand Down Expand Up @@ -235,7 +240,7 @@ jobs:

- name: Dependencies
working-directory: ./
run: npm ci --legacy-peer-deps
run: npm run ci:all

- name: Docker
run: docker-compose up --build -d
Expand Down Expand Up @@ -291,7 +296,7 @@ jobs:

- name: Dependencies
working-directory: ./
run: npm ci --legacy-peer-deps
run: npm run ci:all

- name: Docker
run: docker-compose up --build -d
Expand Down Expand Up @@ -336,7 +341,7 @@ jobs:

- name: Dependencies
working-directory: ./
run: npm ci --legacy-peer-deps
run: npm run ci:all

- name: Docker
run: docker-compose up --build -d
Expand Down
129 changes: 66 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"author": "UK Export Finance",
"scripts": {
"audit:all": "npm audit && npm audit --prefix ./src/ui && npm audit --prefix ./src/api && npm audit --prefix ./generate-exip-pricing-grid",
"ci:all": "npm ci --legacy-peer-deps && npm ci --legacy-peer-deps --prefix ./src/ui && npm ci --legacy-peer-deps --prefix ./src/api && npm ci --legacy-peer-deps --prefix ./generate-exip-pricing-grid",
"housekeeping": "npm run update:all && npm run install:all && npm run lint:fix:all && npm run audit:all",
"postinstall": "husky install",
"install:all": "npm i --legacy-peer-deps && npm i --legacy-peer-deps --prefix ./src/ui && npm i --legacy-peer-deps --prefix ./src/api && npm i --legacy-peer-deps --prefix ./generate-exip-pricing-grid",
Expand Down Expand Up @@ -66,7 +67,7 @@
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-prettier": "^5.1.0",
"husky": "^8.0.3",
"jest": "^29.7.0",
"lint-staged": "^14.0.1",
Expand Down
Loading

0 comments on commit 2208aca

Please sign in to comment.