From f71fb02dcd4c2358b5688dd9a6bdb471a957703f Mon Sep 17 00:00:00 2001 From: BAStos525 Date: Fri, 23 Feb 2024 10:07:14 +0300 Subject: [PATCH] [ci] #4303: Fix Docker Compose path for tests Signed-off-by: BAStos525 --- .github/workflows/iroha2-dev.yml | 13 +++++++------ .github/workflows/iroha2-release.yml | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml index f777ead22f8..02bce00d85e 100644 --- a/.github/workflows/iroha2-dev.yml +++ b/.github/workflows/iroha2-dev.yml @@ -6,6 +6,7 @@ on: env: CARGO_TERM_COLOR: always + DOCKER_COMPOSE_PATH: configs/swarm jobs: registry: @@ -32,16 +33,16 @@ jobs: cache-to: type=gha,mode=max - name: Test docker-compose.single.yml before pushing run: | - docker compose -f docker-compose.single.yml up --wait || exit 1 - docker compose -f docker-compose.single.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml down - name: Test docker-compose.local.yml before pushing run: | - docker compose -f docker-compose.local.yml up --wait || exit 1 - docker compose -f docker-compose.local.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml down - name: Test docker-compose.yml before pushing run: | - docker compose -f docker-compose.yml up --wait || exit 1 - docker compose -f docker-compose.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml down - name: Login to DockerHub uses: docker/login-action@v3 with: diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml index 94c85acbb3c..b2b9a8c48b8 100644 --- a/.github/workflows/iroha2-release.yml +++ b/.github/workflows/iroha2-release.yml @@ -6,6 +6,7 @@ on: env: CARGO_TERM_COLOR: always + DOCKER_COMPOSE_PATH: configs/swarm jobs: registry: @@ -42,16 +43,16 @@ jobs: cache-to: type=gha,mode=max - name: Test docker-compose.single.yml before pushing run: | - docker compose -f docker-compose.single.yml up --wait || exit 1 - docker compose -f docker-compose.single.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml down - name: Test docker-compose.local.yml before pushing run: | - docker compose -f docker-compose.local.yml up --wait || exit 1 - docker compose -f docker-compose.local.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml down - name: Test docker-compose.yml before pushing run: | - docker compose -f docker-compose.yml up --wait || exit 1 - docker compose -f docker-compose.yml down + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml up --wait || exit 1 + docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml down - name: Login to DockerHub uses: docker/login-action@v3 with: