Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit bad3379

Browse files
Merge pull request #8647 from magento/sync-2.4.2
Sync 2.4.2-develop
2 parents 5912548 + a133493 commit bad3379

File tree

40 files changed

+423
-74
lines changed

40 files changed

+423
-74
lines changed

src/_data/mde.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ extensions:
361361
name: Product Recommendations
362362
versions:
363363
-
364-
name: 3.2.2
364+
name: 3.2.3
365365
support:
366366
2.3.0: supported
367367
2.3.1: supported
@@ -373,6 +373,18 @@ extensions:
373373
2.4.0: supported
374374
2.4.1: supported
375375
2.4.2: supported
376+
-
377+
name: 3.2.2
378+
support:
379+
2.3.0: compatible
380+
2.3.1: compatible
381+
2.3.2: compatible
382+
2.3.3: compatible
383+
2.3.4: compatible
384+
2.3.5-p1: compatible
385+
2.3.6: compatible
386+
2.4.0: compatible
387+
2.4.1: compatible
376388
-
377389
name: 3.10.0
378390
support:

src/_data/var.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ mbi: Magento Business Intelligence
2121
# Cloud product name variables
2222

2323
ece: Magento Commerce Cloud
24-
ece-release-date: November 19, 2020
24+
ece-release-date: Feb 1, 2021
2525
csuite: Magento Commerce Cloud Suite
2626
ct: ece-tools
2727
ct-repo: magento/ece-tools
28-
ct-release: 2002.1.4
28+
ct-release: 2002.1.5
2929
mcp-prod: Magento Cloud Patches
3030
mcp-package: magento/magento-cloud-patches
31-
mcp-release: 1.0.8
31+
mcp-release: 1.0.9
3232
mcd-package: magento/magento-cloud-docker
3333
mcd-prod: Magento Cloud Docker
3434
mcd-release: 1.2.1

src/_data/whats-new.yml

Lines changed: 87 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,94 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Mon Jan 25 15:38:42 2021
7+
updated: Thu Feb 4 15:51:53 2021
88
entries:
9-
- description: Added the [DateTime library](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/framework/datetime.html)
9+
- description: Updated the note about [supported PHP versions](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#php).
10+
versions: 2.3.x
11+
type: Technical
12+
date: February 2, 2021
13+
link: https://github.com/magento/devdocs/pull/8613
14+
contributor: jeff-matthews
15+
profile: https://github.com/jeff-matthews
16+
- description: New Relic log file names are now stored in the `filePath` field, with
17+
full paths to the log file. See [View and analyze log data](https://devdocs.magento.com/cloud/project/new-relic.html#view-and-analyze-log-data),
18+
step 4, for querying the logs.
19+
versions: 2.4.x
20+
type: Major Update
21+
date: February 2, 2021
22+
link: https://github.com/magento/devdocs/pull/8614
23+
contributor: bdenham
24+
profile: https://github.com/bdenham
25+
- description: Cloud Patches 1.0.9 [release notes](https://devdocs.magento.com/cloud/release-notes/mcp-release-notes.html).
26+
versions: 2.4.x
27+
type: Major Update
28+
date: February 1, 2021
29+
link: https://github.com/magento/devdocs/pull/8577
30+
contributor: bdenham
31+
profile: https://github.com/bdenham
32+
- description: "[Release notes](https://devdocs.magento.com/cloud/release-notes/ece-release-notes.html#v200215)
33+
for ECE-Tools 2002.1.5."
34+
versions: 2.4.x
35+
type: Major Update
36+
date: February 1, 2021
37+
link: https://github.com/magento/devdocs/pull/8578
38+
contributor: bdenham
39+
profile: https://github.com/bdenham
40+
- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
41+
for the 1.0.15 Magento Quality Patch (MQP) package release.
42+
versions: 2.x
43+
type: Major Update
44+
date: February 1, 2021
45+
link: https://github.com/magento/devdocs/pull/8607
46+
contributor: ilima-ebay
47+
profile: https://github.com/ilima-ebay
48+
- description: Added an example use case of the [gallery widget](https://devdocs.magento.com/guides/v2.4/javascript-dev-guide/widgets/widget_gallery.html).
49+
versions: 2.3.x, 2.4.x
50+
type: Major Update
51+
date: January 29, 2021
52+
link: https://github.com/magento/devdocs/pull/8556
53+
contributor: DashukVolodymyr
54+
profile: https://github.com/DashukVolodymyr
55+
- description: Default disk space for the application and database in cloud templates
56+
were updated from 2GB to 5GB.
57+
versions: 2.4.x
58+
type: Major Update
59+
date: January 29, 2021
60+
link: https://github.com/magento/devdocs/pull/8588
61+
contributor: oshmyheliuk
62+
profile: https://github.com/oshmyheliuk
63+
- description: Added the [Maintainer's Handbook](https://devdocs.magento.com/contributor-guide/maintainer-handbook.html)
64+
topic.
65+
versions: 2.x
66+
type: New Topic
67+
date: January 29, 2021
68+
link: https://github.com/magento/devdocs/pull/8580
69+
contributor: gabrieldagama
70+
profile: https://github.com/gabrieldagama
71+
- description: Added more information about security releases to our [release policy](https://devdocs.magento.com/release/policy/).
72+
versions: 2.x
73+
type: Major Update
74+
date: January 27, 2021
75+
link: https://github.com/magento/devdocs/pull/8575
76+
contributor: jeff-matthews
77+
profile: https://github.com/jeff-matthews
78+
- description: Updated the [Upgrade Compatibility Tool](https://devdocs.magento.com/upgrade-compatibility-tool/introduction.html)
79+
topic with the latest name and acronym changes.
80+
versions: ''
81+
type: Major Update
82+
date: January 26, 2021
83+
link: https://github.com/magento/devdocs/pull/8553
84+
contributor: danidelcar
85+
profile: https://github.com/danidelcar
86+
- description: Reorganized the [Installation Guide](https://devdocs.magento.com/guides/v2.4/install-gde/install-flow-diagram.html)
87+
to improve usability.
88+
versions: 2.3.x, 2.4.x
89+
type: Major Update
90+
date: January 25, 2021
91+
link: https://github.com/magento/devdocs/pull/8558
92+
contributor: jeff-matthews
93+
profile: https://github.com/jeff-matthews
94+
- description: Added the [DateTime library](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/framework/datetime.html)
1095
topic to the _PHP Developer Guide_.
1196
versions: 2.3.x, 2.4.x
1297
type: New Topic

src/_includes/cache/page-cache-overview.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ We recommend using [Varnish]({{ page.baseurl }}/config-guide/varnish/config-varn
2121

2222
To create an uncacheable page, mark any block on that page as uncacheable in the layout using `cacheable="false"`.
2323

24+
```xml
25+
<block class="Magento\Customer\Block\Form\Edit" name="customer_edit" template="Magento_Customer::form/edit.phtml" cacheable="false">
26+
<container name="form.additional.info" as="form_additional_info"/>
27+
</block>
28+
```
29+
2430
Examples of uncacheable pages include the compare products, cart, [checkout](https://glossary.magento.com/checkout) pages, and so on.
2531

2632
[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml){:target="_blank"}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
Magento supports PHP 7.3.
22

33
{:.bs-callout-warning}
4-
PHP 7.1 has reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software.
5-
Installing from GitHub will no longer work with Magento 2.3.4/PHP 7.1.
6-
The only way to install 2.3.4 with PHP 7.1.x is with Composer.
4+
PHP 7.1 and 7.2 have reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software. Magento 2.3.x supports PHP 7.3 only and has not been tested with PHP 7.1 or 7.2.

src/cloud/env/variables-build.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@ stage:
8686
SCD_COMPRESSION_TIMEOUT: 800
8787
```
8888

89+
### `SCD_NO_PARENT`
90+
91+
- **Default**—`false`
92+
- **Version**—Magento 2.4.2 and later
93+
94+
Set to `true` to prevent generating static content for parent themes during the build phase.
95+
96+
We recommend setting `SCD_NO_PARENT: false` during the build phase so that generating static content for the parent themes does not impact site deployment or cause unnecessary site downtime. See [Static content deployment]({{site.baseurl}}/cloud/deploy/static-content-deployment.html).
97+
98+
```yaml
99+
stage:
100+
build:
101+
SCD_NO_PARENT: false
102+
```
103+
89104
### `SCD_MATRIX`
90105

91106
- **Default**—_Not set_

src/cloud/env/variables-deploy.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Deploy variables
44
functional_areas:
55
- Cloud
66
- Configuration
7-
redirect_from:
7+
redirect_from:
88
- /cloud/trouble/message-queues.html
99
---
1010

@@ -425,6 +425,26 @@ You must have a Redis service configured in the `.magento.app.yaml` file and in
425425

426426
The read-only connection is not available for use in the Integration environment or if you use the [`CACHE_CONFIGURATION` variable](#cache_configuration).
427427

428+
### `REMOTE_STORAGE`
429+
430+
- **Default**—_Not set_
431+
- **Version**—Magento 2.4.2 and later
432+
433+
Configure a _storage adapter_ to store media files in a persistent, remote storage container using a storage service, such as AWS S3. Use the remote storage option to improve performance on Cloud projects with complex, multi-server configurations that must share resources.
434+
435+
```yaml
436+
stage:
437+
deploy:
438+
REMOTE_STORAGE:
439+
driver: aws-s3 # Required
440+
prefix: cloud # Optional
441+
config:
442+
bucket: my-bucket # Required
443+
region: my-region # Required
444+
key: my-key # Optional
445+
secret: my-secret-key # Optional
446+
```
447+
428448
### `RESOURCE_CONFIGURATION`
429449

430450
- **Default**—Not set
@@ -517,6 +537,19 @@ stage:
517537

518538
{% include cloud/note-increase-scd-max-execution-time-variable.md%}
519539

540+
### `SCD_NO_PARENT`
541+
542+
- **Default**—`false`
543+
- **Version**—Magento 2.4.2 and later
544+
545+
On the deploy phase, we recommend setting `SCD_NO_PARENT: true` so that the generation of static content for parent themes does not occur during the deploy phase. This setting minimizes deployment time and prevents site downtime that can occur if the static content build fails during the deployment. See [Static content deployment]({{site.baseurl}}/cloud/deploy/static-content-deployment.html).
546+
547+
```yaml
548+
stage:
549+
deploy:
550+
SCD_NO_PARENT: true
551+
```
552+
520553
### `SCD_STRATEGY`
521554

522555
- **Default**—`quick`

src/cloud/env/variables-global.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,19 @@ stage:
7575

7676
{% include cloud/note-increase-scd-max-execution-time-variable.md%}
7777

78+
### `SCD_NO_PARENT`
79+
80+
- **Default**—_Not set_
81+
- **Version**—Magento 2.4.2 and later
82+
83+
Set to `true` to prevent generating static content for parent themes during the build and deployment phases. When this option is set to `true`, less static content is generated, which improves your overall build and deployment times.
84+
85+
```yaml
86+
stage:
87+
global:
88+
SCD_NO_PARENT: true
89+
```
90+
7891
### `SCD_USE_BALER`
7992

8093
- **Default**—_Not set_

src/cloud/project/magento-env-yaml.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,20 @@ stage:
112112
deploy:
113113
CLEAN_STATIC_FILES: false
114114
```
115+
116+
## Validate configuration file
117+
118+
Use the following CLI command to validate the `.magento.env.yaml` configuration file before pushing changes to the remote Cloud environment.
119+
120+
```bash
121+
php ./vendor/bin/ece-tools cloud:config:validate
122+
```
123+
124+
The following sample response provides a list of items to correct:
125+
126+
```terminal
127+
Environment configuration is not valid. Correct the following items in your .magento.env.yaml file:
128+
The SCD_THREADS variable contains an invalid value of type string. Use the following type: integer.
129+
The SCD_STRATEGY variable contains an invalid value fast. Use one of the available value options: compact, quick, standard.
130+
The NOT_EXIST_OPTION variable is not allowed in configuration.
131+
```

src/cloud/project/new-relic.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ To use the New Relic Logs application:
227227
{:.bs-callout-tip}
228228
You can also access the New Relic Logs application from the New Relic ONE home page. See [New Relic ONE core UI components][New Relic One UI].
229229

230-
1. To review infrastructure log data for cloud services, enter the query string `has: "ident"` in the _Find logs where_ field. Then, click **Query logs**.
230+
1. To review infrastructure log data for cloud services, enter the query string `has: "filePath"` in the _Find logs where_ field. Then, click **Query logs**.
231+
The names of the log files are stored in the `filePath` field, with full paths to the log file.
231232

232233
![Cloud project New Relic service log data]({{ site.baseurl }}/common/images/cloud/cloud_new-relic-log-query-has-ident.png){:width="650px"}
233234

0 commit comments

Comments
 (0)