Merge pull request #953 from nextcloud/fix/noid/integration-test-dock…

…er-compose Fix integration tests sometimes not finding docker-compose
nextcloud · Sep 26, 2024 · a3f3fb5 · a3f3fb5
2 parents 0382ca4 + b09cfb6
commit a3f3fb5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -87,7 +87,9 @@ 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 \
+            || docker compose -f "docker-compose.integration.yml" up -d --build
         working-directory: apps/${{ env.APP_NAME }}/tests/
 
       - name: Set up php ${{ matrix.php-versions }}
@@ -130,5 +132,7 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: docker-compose -f "docker-compose.integration.yml" down
+        run: |
+          docker-compose -f "docker-compose.integration.yml" down \
+            || docker compose -f "docker-compose.integration.yml" down
         working-directory: apps/${{ env.APP_NAME }}/tests/