Skip to content

Commit 8374a04

Browse files
committed
hopefully this works again
1 parent 92a6c76 commit 8374a04

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ on:
88
pull_request:
99
branches: [main]
1010

11-
env:
12-
PG_PORT: 5432
13-
PG_USER: postgres
14-
PG_PASSWORD: postgres
15-
PG_DB: test_db
16-
PG_HOST: db:5432
17-
1811
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1912
jobs:
2013
backend_testing:
@@ -37,9 +30,5 @@ jobs:
3730
run: cd frontend && npm install && npm run types
3831
- name: Building docker containers using docker-compose
3932
run: GO_MOD=go.mod docker compose --env-file=./config/ci.env.dev up --wait --build backend db staging_db frontend
40-
- name: Wait for Go BE to configure
41-
uses: juliangruber/sleep-action@v1
42-
with:
43-
time: 5s
4433
- name: React tests
4534
run: docker exec frontend npm test

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ services:
1818
dockerfile: ./Dockerfile.development
1919
volumes:
2020
- './frontend:/app'
21+
depends_on:
22+
- backend
2123
stdin_open: true
2224
ports:
2325
- 3000:3000

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"scripts": {
3232
"start": "react-scripts start",
3333
"build": "react-scripts build",
34-
"test": "react-scripts test",
34+
"test": "CI=true react-scripts test",
3535
"eject": "react-scripts eject",
3636
"lint": "eslint",
3737
"types": "tsc --noEmit && npm run lint",

0 commit comments

Comments
 (0)