Skip to content

Commit 28a4c4d

Browse files
committed
fix: try another approach
1 parent 0215402 commit 28a4c4d

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/ci.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,15 @@ jobs:
5656
ln -s repos/delphi/delphi-epidata/dev/local/pyproject.toml repos/
5757
ln -s repos/delphi/delphi-epidata/dev/local/setup.cfg repos/
5858
59-
- name: Build docker images and run tests
60-
run: make test
59+
- name: Build docker images
60+
run: |
61+
make db
62+
make web
63+
make redis
64+
65+
- name: Run tests
66+
run: |
67+
make test
6168
6269
- name: Clean Up
6370
run: |

dev/local/Makefile

+5-6
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ $(info M1 system detected, changing docker platform to linux/amd64.)
7575
override M1 =--platform linux/amd64
7676
endif
7777

78+
.PHONY=db
79+
db:
80+
@docker compose up delphi_database_epidata $(M1) --detach
81+
@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
82+
7883
.PHONY=web
7984
web:
8085
@docker compose up delphi_web_epidata $(M1) \
8186
--env "SQLALCHEMY_DATABASE_URI=$(sqlalchemy_uri)" \
8287
--detach
8388
@docker logs -f delphi_web_epidata >$(LOG_WEB) 2>&1 &
8489

85-
.PHONY=db
86-
db:
87-
@docker compose up delphi_database_epidata $(M1) --detach
88-
@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
89-
9090
.PHONY=redis
9191
redis:
9292
@docker compose up delphi_redis $(M1) --detach
@@ -100,7 +100,6 @@ test:
100100
r-test:
101101
@docker compose run delphi_web_python $(M1) Rscript repos/delphi/delphi-epidata/integrations/client/test_delphi_epidata.R | tee r-test_output_$(NOW).log
102102

103-
104103
.PHONY=bash
105104
bash:
106105
@docker compose run delphi_web_python $(M1) bash

0 commit comments

Comments
 (0)