fix: try another approach

cmu-delphi · Oct 13, 2023 · 28a4c4d · 28a4c4d
1 parent 0215402
commit 28a4c4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,8 +56,15 @@ jobs:
           ln -s repos/delphi/delphi-epidata/dev/local/pyproject.toml repos/
           ln -s repos/delphi/delphi-epidata/dev/local/setup.cfg repos/
 
-      - name: Build docker images and run tests
-        run: make test
+      - name: Build docker images
+        run: |
+          make db
+          make web
+          make redis
+
+      - name: Run tests
+        run: |
+          make test
 
       - name: Clean Up
         run: |

diff --git a/dev/local/Makefile b/dev/local/Makefile
@@ -75,18 +75,18 @@ $(info M1 system detected, changing docker platform to linux/amd64.)
 	override M1 =--platform linux/amd64
 endif
 
+.PHONY=db
+db:
+	@docker compose up delphi_database_epidata $(M1) --detach
+	@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
+
 .PHONY=web
 web:
 	@docker compose up delphi_web_epidata $(M1) \
 		--env "SQLALCHEMY_DATABASE_URI=$(sqlalchemy_uri)" \
 		--detach
 	@docker logs -f delphi_web_epidata >$(LOG_WEB) 2>&1 &
 
-.PHONY=db
-db:
-	@docker compose up delphi_database_epidata $(M1) --detach
-	@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
-
 .PHONY=redis
 redis:
 	@docker compose up delphi_redis $(M1) --detach
@@ -100,7 +100,6 @@ test:
 r-test:
 	@docker compose run delphi_web_python $(M1) Rscript repos/delphi/delphi-epidata/integrations/client/test_delphi_epidata.R | tee r-test_output_$(NOW).log
 
-
 .PHONY=bash
 bash:
 	@docker compose run delphi_web_python $(M1) bash