3.3.9

.github/workflows/ci.yml

@@ -6,6 +6,12 @@ on:
   workflow_call:
   pull_request:
 
+# A new push to a PR makes the previous run for it obsolete, so cancel it.
+# Pushes to develop and master still run to completion.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -28,13 +34,19 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
+      # Composer on the runner uses ~/.cache/composer, not ~/.composer/cache,
+      # so ask it for the directory instead of hard-coding one.
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
       - name: Cache Composer
         uses: actions/cache@v4
         with:
-          path: ~/.composer/cache
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
+            ${{ runner.os }}-composer-${{ matrix.php-version }}-
 
       - name: Install dependencies
         run: npm ci
@@ -57,10 +69,14 @@ jobs:
         with:
           php-version: '8.5'
 
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
       - name: Cache Composer
         uses: actions/cache@v4
         with:
-          path: ~/.composer/cache
+          path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-phpstan-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-phpstan-
@@ -98,10 +114,14 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
       - name: Cache Composer
         uses: actions/cache@v4
         with:
-          path: ~/.composer/cache
+          path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-unit-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-unit-
@@ -163,10 +183,14 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
       - name: Cache Composer
         uses: actions/cache@v4
         with:
-          path: ~/.composer/cache
+          path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-e2e-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-e2e-

gruntfile.js

@@ -84,6 +84,7 @@ module.exports = function ( grunt ) {
 				},
 				cwd: '<%= tester_dir %>',
 				expand: true,
+				dest: 'cloudinary-update-tester',
 				src: [ '**/*' ],
 			},
 		},

js/block-editor.asset.php

@@ -1 +1,12 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'a9b2df98cf4781d2997f');
+<?php return array(
+	'dependencies' => array(
+		'wp-api-fetch',
+		'wp-block-editor',
+		'wp-components',
+		'wp-data',
+		'wp-element',
+		'wp-hooks',
+		'wp-i18n'
+	),
+	'version' => 'a9b2df98cf4781d2997f'
+);

js/deactivate.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array('wp-api-fetch'), 'version' => '24f5905e1f37fc7522df');
+<?php return array(
+	'dependencies' => array(
+		'wp-api-fetch'
+	),
+	'version' => '24f5905e1f37fc7522df'
+);

js/gallery-block.asset.php

@@ -1 +1,13 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '204a233955ee49cd6bc1');
+<?php return array(
+	'dependencies' => array(
+		'wp-api-fetch',
+		'wp-block-editor',
+		'wp-blocks',
+		'wp-components',
+		'wp-components/build-style/style.css',
+		'wp-data',
+		'wp-element',
+		'wp-i18n'
+	),
+	'version' => 'f4dd3a6a83f3bee704eb'
+);

js/gallery-init.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => '746e6463d7d00962313d');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => '746e6463d7d00962313d'
+);

js/gallery.asset.php

@@ -1 +1,11 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'dd272475a4c14b284cf4');
+<?php return array(
+	'dependencies' => array(
+		'wp-block-editor',
+		'wp-components',
+		'wp-components/build-style/style.css',
+		'wp-data',
+		'wp-element',
+		'wp-i18n'
+	),
+	'version' => '156851c22c2575a2142f'
+);

js/inline-loader.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => '628a48b80bb52b9b0738');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => '628a48b80bb52b9b0738'
+);

js/lazy-load.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => 'f9ca20744898bd9abaec');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => 'f9ca20744898bd9abaec'
+);

js/media-modal.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => 'cffc26ed672e922e6588');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => 'cffc26ed672e922e6588'
+);

js/terms-order.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => '2f7f1b83c7516fc1c316');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => '2f7f1b83c7516fc1c316'
+);

js/video-init.asset.php

@@ -1 +1,6 @@
-<?php return array('dependencies' => array(), 'version' => 'd6d2d0466119a6a1f919');
+<?php return array(
+	'dependencies' => array(
+
+	),
+	'version' => 'd6d2d0466119a6a1f919'
+);