Skip to content

Commit

Permalink
fix integration tests sometimes not finding docker-compose but 'docke…
Browse files Browse the repository at this point in the history
…r compose'

Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
julien-nc committed Sep 26, 2024
1 parent 0382ca4 commit 535fc55
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ jobs:
path: apps/${{ env.APP_NAME }}

- name: Start keycloak
run: docker-compose -f "docker-compose.integration.yml" up -d --build
run: |
docker-compose -f "docker-compose.integration.yml" up -d --build \
|| echo "DOCKER-COMPOSE not found. Falling back to 'docker compose'" \
&& docker compose -f "docker-compose.integration.yml" up -d --build
working-directory: apps/${{ env.APP_NAME }}/tests/

- name: Set up php ${{ matrix.php-versions }}
Expand Down Expand Up @@ -130,5 +133,8 @@ jobs:

- name: Stop containers
if: always()
run: docker-compose -f "docker-compose.integration.yml" down
run: |
docker-compose -f "docker-compose.integration.yml" down \
|| echo "DOCKER-COMPOSE not found. Falling back to 'docker compose'" \
&& docker compose -f "docker-compose.integration.yml" down
working-directory: apps/${{ env.APP_NAME }}/tests/

0 comments on commit 535fc55

Please sign in to comment.