Merge pull request #3959 from 10up/chore/npm-update

Initial packages update
10up · Aug 9, 2024 · 4b047c0 · 4b047c0
2 parents 1774d0a + 00d6036
commit 4b047c0
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 226 deletions.
diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -89,7 +89,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: cypress-artifact-${{ matrix.core.name }}-${{ matrix.testGroup }}
+        name: cypress-artifact-${{ matrix.esVersion }}-${{ matrix.core.name }}-${{ matrix.testGroup }}
         retention-days: 2
         path: |
           ${{ github.workspace }}/tests/cypress/screenshots/
@@ -98,7 +98,7 @@ jobs:
 
     - name: Stop Elasticsearch
       if: always()
-      run: cd bin/es-docker/ && docker-compose down
+      run: cd bin/es-docker/ && docker compose down
 
     - name: Test plugin uninstall
       if: always()

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
       run: sudo systemctl start mysql.service
 
     - name: Setup Elasticsearch
-      run: cd bin/es-docker/ && docker-compose build --build-arg ES_VERSION=${{ matrix.esVersion }} && docker-compose up -d
+      run: cd bin/es-docker/ && docker compose build --build-arg ES_VERSION=${{ matrix.esVersion }} && docker compose up -d
 
     - name: Check ES response
       run: curl --connect-timeout 5 --max-time 10 --retry 5 --retry-max-time 40 --retry-all-errors http://127.0.0.1:8890

diff --git a/bin/wp-env-cli b/bin/wp-env-cli
@@ -14,7 +14,7 @@ function spawnCommandDirectly({ container, command, dockerComposeConfigPath }) {
 	];
 
 	return new Promise((resolve, reject) => {
-		const childProc = spawn('docker-compose', composeCommand, {
+		const childProc = spawn('docker compose', composeCommand, {
 			stdio: 'inherit',
 			shell: true,
 		});