Merge branch 'main' into ECP-8938

Adyen · Aug 6, 2024 · 11d2d8e · 11d2d8e
2 parents 55b5a8e + c4929b2
commit 11d2d8e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/e2e-test-dispatch.yml b/.github/workflows/e2e-test-dispatch.yml
@@ -42,11 +42,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Magento
-        run: docker-compose -f .github/docker-compose.yml run --rm web make magento
+        run: docker compose -f .github/docker-compose.yml run --rm web make magento
 
       - name: Start web server in background
-        run: docker-compose -f .github/docker-compose.yml up -d web
-        
+        run: docker compose -f .github/docker-compose.yml up -d web
+
       - name: Setup permissions
         run: docker exec magento2-container make fs
 
@@ -94,7 +94,7 @@ jobs:
         run: docker exec magento2-container make fs
 
       - name: Run E2E tests
-        run: docker-compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh ${{inputs.testGroup}}
+        run: docker compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh ${{inputs.testGroup}}
         env:
           INTEGRATION_TESTS_BRANCH: ${{inputs.testBranch}}
           MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}

diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     if: |
-      ${{ 
+      ${{
       github.event.pull_request.draft == false &&
       (github.actor != 'renovate[bot]' || github.actor != 'lgtm-com[bot]')
       }}
@@ -32,10 +32,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Magento
-        run: docker-compose -f .github/docker-compose.yml run --rm web make magento
+        run: docker compose -f .github/docker-compose.yml run --rm web make magento
 
       - name: Start web server in background
-        run: docker-compose -f .github/docker-compose.yml up -d web
+        run: docker compose -f .github/docker-compose.yml up -d web
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
@@ -59,7 +59,7 @@ jobs:
         run: docker exec magento2-container make fs
 
       - name: Run E2E tests
-        run: docker-compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh express-checkout
+        run: docker compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh express-checkout
         env:
           INTEGRATION_TESTS_BRANCH: develop
           MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -29,10 +29,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Magento
-        run: docker-compose -f .github/docker-compose.yml run --rm web make magento
+        run: docker compose -f .github/docker-compose.yml run --rm web make magento
 
       - name: Start web server in background
-        run: docker-compose -f .github/docker-compose.yml up -d web
+        run: docker compose -f .github/docker-compose.yml up -d web
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
@@ -72,7 +72,7 @@ jobs:
         run: docker exec magento2-container make fs
 
       - name: Run E2E tests
-        run: docker-compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh standard
+        run: docker compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh standard
         env:
           INTEGRATION_TESTS_BRANCH: develop
           MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}

diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml
@@ -25,10 +25,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Magento
-        run: docker-compose -f .github/docker-compose.yml run --rm web make magento
+        run: docker compose -f .github/docker-compose.yml run --rm web make magento
 
       - name: Start web server in background
-        run: docker-compose -f .github/docker-compose.yml up -d web
+        run: docker compose -f .github/docker-compose.yml up -d web
 
       - name: Setup permissions
         run: docker exec magento2-container make fs

diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Start services
-        run: docker-compose -f .github/docker-compose.yml -f .github/docker-compose.mftf.yml up -d
+        run: docker compose -f .github/docker-compose.yml -f .github/docker-compose.mftf.yml up -d
 
       # Temp solution to wait for install script to run
       - name: Sleep for 120 seconds

diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml
@@ -25,10 +25,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Magento
-        run: docker-compose -f .github/docker-compose.yml run --rm web make magento
+        run: docker compose -f .github/docker-compose.yml run --rm web make magento
 
       - name: Start web server in background
-        run: docker-compose -f .github/docker-compose.yml up -d web
+        run: docker compose -f .github/docker-compose.yml up -d web
 
       - name: Setup permissions
         run: docker exec magento2-container make fs