From 7ea609167f3814b8cb05a733276fde99a1c13170 Mon Sep 17 00:00:00 2001 From: Blair Currey <12960453+BlairCurrey@users.noreply.github.com> Date: Mon, 18 Mar 2024 21:22:52 -0400 Subject: [PATCH] ci: use docker compose (v2) instead of docker-compose (v1) --- .github/workflows/integration_test.yml | 4 ++-- test/integration/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 821ec885a2..bf9b7b2c2a 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -9,6 +9,8 @@ on: name: Integration Tests +# TODO: these show as seperate checks in PR... shouldn't + jobs: checkout: runs-on: ubuntu-22.04 @@ -30,7 +32,5 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/workflows/rafiki/env-setup - - run: docker-compose -v - - run: docker compose version - run: pnpm --filter integration build:deps - run: pnpm --filter integration run-tests \ No newline at end of file diff --git a/test/integration/package.json b/test/integration/package.json index 0ffec1ffe6..c9b8671819 100644 --- a/test/integration/package.json +++ b/test/integration/package.json @@ -5,7 +5,7 @@ "description": "", "scripts": { "build:deps": "pnpm --filter mock-account-service-lib build", - "testenv:compose": "docker-compose -f ./testenv/cloud-nine-wallet/docker-compose.yml -f ./testenv/happy-life-bank/docker-compose.yml -f ./testenv/docker-compose.yml", + "testenv:compose": "docker compose -f ./testenv/cloud-nine-wallet/docker-compose.yml -f ./testenv/happy-life-bank/docker-compose.yml -f ./testenv/docker-compose.yml", "test": "jest", "run-tests": "./scripts/run-tests.sh" },