From 202555feebf4c7c3d89f9b23b3661372e2a70110 Mon Sep 17 00:00:00 2001 From: Max Ekman Date: Sun, 5 Jan 2025 20:49:51 +0100 Subject: [PATCH 1/2] fix(ci): update to up/download-artifact v4 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3dc76c8..1d8f7d58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: make test_cover - name: Store coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage path: unit.coverprofile @@ -51,7 +51,7 @@ jobs: make test_integration_cover - name: Store coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage path: integration.coverprofile @@ -69,7 +69,7 @@ jobs: go-version: 1.16 - name: Load coverage - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: coverage From b3c17d9285061291bccee2a2f95319169c36e6bf Mon Sep 17 00:00:00 2001 From: Max Ekman Date: Sun, 5 Jan 2025 20:58:11 +0100 Subject: [PATCH 2/2] fix(makefile): use Docker Compose v2 --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 808487ed..2b814bc8 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ test_loadtest: .PHONY: test_all_docker test_all_docker: - docker-compose up --build --force-recreate eventhorizon-test + docker compose up --build --force-recreate eventhorizon-test .PHONY: merge_coverage merge_coverage: @@ -42,31 +42,31 @@ upload_coverage: .PHONY: run run: - docker-compose up -d mongodb gpubsub kafka redis nats + docker compose up -d mongodb gpubsub kafka redis nats .PHONY: run_mongodb run_mongodb: - docker-compose up -d mongodb + docker compose up -d mongodb .PHONY: run_gpubsub run_gpubsub: - docker-compose up -d gpubsub + docker compose up -d gpubsub .PHONY: run_kafka run_kafka: - docker-compose up -d kafka + docker compose up -d kafka .PHONY: run_redis run_redis: - docker-compose up -d redis + docker compose up -d redis .PHONY: run_nats run_nats: - docker-compose up -d nats + docker compose up -d nats .PHONY: stop stop: - docker-compose down + docker compose down .PHONY: clean clean: