From f0d4b5d8ea7737429563a208ca933ee9fff61925 Mon Sep 17 00:00:00 2001 From: Langleu Date: Fri, 2 Aug 2024 09:19:54 +0200 Subject: [PATCH] fix(test): compose command wasnt properly parsed likely related to compose v1 deprecation --- .github/actions/compose/healthy.sh | 2 +- .github/workflows/build-images.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/compose/healthy.sh b/.github/actions/compose/healthy.sh index 0b71ec9f..22a12e24 100755 --- a/.github/actions/compose/healthy.sh +++ b/.github/actions/compose/healthy.sh @@ -5,7 +5,7 @@ # Edge case; Self-hosted runners don't support "docker compose" yet even though on v2 VERSION=$(docker-compose version --short) -if [[ "$VERSION" =~ ^1\.[0-9]+\.[0-9]+ ]]; then +if [[ "$VERSION" =~ ^1\.[0-9]+\.[0-9]+ || -z "${VERSION}" ]]; then # if docker-compose is v1, we're setting it to docker compose, which should be v2 echo "Deteceted v1, setting to v2" DOCKER_COMMAND="docker compose -f ${FILE} ${COMPOSE_FLAGS}" diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 3c04f612..bf5406b1 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -533,7 +533,7 @@ jobs: notify-on-failure: runs-on: ubuntu-latest - if: failure() + if: failure() && github.event_name == 'schedule' needs: - publish-image - read-build-image-output @@ -543,7 +543,6 @@ jobs: steps: - name: Notify in Slack in case of failure id: slack-notification - if: github.event_name == 'schedule' uses: camunda/infraex-common-config/.github/actions/report-failure-on-slack@44ea6ed8c70214b8ef629c292ae0e84710179633 # main with: vault_addr: ${{ secrets.VAULT_ADDR }}