Skip to content

Commit 2cb60a7

Browse files
authored
Merge pull request #8 from europanite/feature/develop
Feature/develop
2 parents 82c421a + 8875dcd commit 2cb60a7

7 files changed

Lines changed: 20 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
node: [18, 20, 22]
18+
node: [18, 20, 22, 24]
1919
env:
2020
CI: "1"
2121
EXPO_TUNNEL: "false"
2222
EXPO_DEVTOOLS_LISTEN_ADDRESS: 0.0.0.0
2323
EXPO_PUBLIC_API_BASE: http://localhost:8000
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
- name: Use Node ${{ matrix.node }}
28-
uses: actions/setup-node@v4
28+
uses: actions/setup-node@v5
2929
with:
3030
node-version: ${{ matrix.node }}
3131
cache: npm
@@ -44,7 +44,7 @@ jobs:
4444
run: npm test -- --ci --runInBand --coverage --verbose
4545
- name: Upload coverage
4646
if: always()
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v7
4848
with:
4949
name: coverage-node${{ matrix.node }}
5050
path: frontend/app/coverage
@@ -57,11 +57,11 @@ jobs:
5757
CI: "1"
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v4
61-
- name: Use Node 20
62-
uses: actions/setup-node@v4
60+
uses: actions/checkout@v5
61+
- name: Use Node 24
62+
uses: actions/setup-node@v5
6363
with:
64-
node-version: 20
64+
node-version: 24
6565
cache: npm
6666
cache-dependency-path: frontend/app/package-lock.json
6767
- name: Install deps
@@ -72,7 +72,7 @@ jobs:
7272
run: npm run build:demo
7373
- name: Upload dist (preview artifact)
7474
if: always()
75-
uses: actions/upload-artifact@v4
75+
uses: actions/upload-artifact@v7
7676
with:
7777
name: web-dist
7878
path: frontend/app/dist

.github/workflows/docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
REACT_NATIVE_PACKAGER_HOSTNAME: 192.168.3.2
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v3
19+
uses: docker/setup-buildx-action@v4
2020
- name: Run tests via docker-compose (deterministic CI)
2121
run: |
2222
docker compose -f docker-compose.test.yml up --build --exit-code-from frontend_test
2323
- name: Upload test reports (if mounted)
2424
if: always()
25-
uses: actions/upload-artifact@v4
25+
uses: actions/upload-artifact@v7
2626
with:
2727
name: frontend-reports
2828
path: reports/frontend

.github/workflows/pages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
- name: Setup Node
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
24-
node-version: 20
24+
node-version: 24
2525
- name: Install deps
2626
working-directory: ./frontend/app
2727
run: npm i
@@ -40,4 +40,4 @@ jobs:
4040
url: ${{ steps.deployment.outputs.page_url }}
4141
steps:
4242
- id: deployment
43-
uses: actions/deploy-pages@v4
43+
uses: actions/deploy-pages@v5

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ desktop.ini
1818
*.tar
1919

2020
# coverage reports
21+
reports/
2122
coverage/
2223
frontend/app/coverage/
2324

docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ services:
1010
- /app/node_modules
1111
- ./reports/frontend:/reports/frontend
1212
command: >-
13-
sh -lc "npm ci && npm test -- --ci --runInBand --verbose"
13+
sh -lc "mkdir -p /reports/frontend && printf 'Jest docker test reports\n' > /reports/frontend/README.txt && npm ci && npm test -- --ci --runInBand --coverage --verbose --coverageDirectory=/reports/frontend/coverage --json --outputFile=/reports/frontend/jest-results.json"

frontend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bullseye
1+
FROM node:24-bookworm-slim
22

33
WORKDIR /app
44
COPY app/package*.json ./

frontend/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bullseye
1+
FROM node:24-bookworm-slim
22

33
WORKDIR /app
44
COPY app/package*.json ./

0 commit comments

Comments
 (0)