Procházet zdrojové kódy

Merge branch '2.x' into main

Jordi Boggiano před 3 roky
rodič
revize
5eca08223d
2 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 2 2
      .github/workflows/continuous-integration.yml
  2. 2 2
      CHANGELOG.md

+ 2 - 2
.github/workflows/continuous-integration.yml

@@ -32,7 +32,7 @@ jobs:
         uses: "actions/checkout@v2"
 
       - name: Run CouchDB
-        timeout-minutes: 1
+        timeout-minutes: 3
         continue-on-error: true
         uses: "cobot/couchdb-action@master"
         with:
@@ -114,7 +114,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
 
       - name: Run Elasticsearch
-        timeout-minutes: 1
+        timeout-minutes: 3
         uses: elastic/elastic-github-actions/elasticsearch@master
         with:
           stack-version: "${{ matrix.es-version }}"

+ 2 - 2
CHANGELOG.md

@@ -1,7 +1,7 @@
 ### 2.5.0 (2022-04-08)
 
-* Added `callType` to IntrospectionProcessor (#1612)
-* Fixed AsMonologProcessor syntax to be compatible with PHP 7.2 (#1651)
+  * Added `callType` to IntrospectionProcessor (#1612)
+  * Fixed AsMonologProcessor syntax to be compatible with PHP 7.2 (#1651)
 
 ### 2.4.0 (2022-03-14)