Merge pull request #874 from EC-CUBE/dependabot/composer/doctrine/ins…

…tantiator-1.5.0 Bump doctrine/instantiator from 1.0.5 to 1.5.0
EC-CUBE · Apr 19, 2024 · eb4bdc2 · eb4bdc2
2 parents 6cbdabf + ba12b18
commit eb4bdc2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 23 deletions.
diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml
@@ -63,7 +63,7 @@ runs:
         load: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        cache-from: type=gha,scope=php-${{ inputs.php-version }}
+        cache-from: type=gha,timeout=1m,scope=php-${{ inputs.php-version }}
         cache-to: ${{ inputs.cache-to }}
         build-args: |
           PHP_VERSION_TAG=${{ inputs.php-version }}

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -29,4 +29,4 @@ jobs:
         uses: ./.github/actions/dockerbuild
         with:
           php-version: ${{ matrix.php }}
-          cache-to: type=gha,mode=max,scope=php-${{ matrix.php }}
+          cache-to: type=gha,mode=max,ignore-error=true,scope=php-${{ matrix.php }}
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         }
     },
     "require-dev": {
-        "doctrine/instantiator": "~1.0.5",
+        "doctrine/instantiator": "~1.5.0",
         "fakerphp/faker": "^1.23",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
         "nanasess/eccube2-fixture-generator": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -7,8 +7,8 @@ const config: PlaywrightTestConfig = {
 
   testDir: './e2e-tests',
 
-  /* Maximum time one test can run for. */
-  timeout: 600 * 1000,
+  /* Maximum time one test can run for.(Defaults to 30000) */
+  timeout: process.env.HTTP_PROXY ? 600 * 1000 : 30000,
 
   expect: {