From baad7505e34a09db1fbda7426e6fdff6881b9305 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Thu, 9 May 2019 12:27:10 -0500 Subject: [PATCH 1/6] Add version table and update instructions. --- docs/versioning.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/versioning.md b/docs/versioning.md index 026cab8f8..55ae4dda6 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -30,7 +30,6 @@ X.Y.Z | | +-- Backward Compatible changes (Patch release - bug fixes, small additions) | +---- Backward Compatible changes (Minor release - small new features, bug fixes) +------ Backward Incompatible changes (Major release - new features and/or major changes) - ``` For example: @@ -56,3 +55,32 @@ It MAY include patch level changes. Patch version MUST be reset to 0 when minor Major version **X** MUST be incremented for a release that introduces backward incompatible changes. A major release can also include minor and patch level changes. You must reset the patch and minor version to 0 when you change the major version. + +## MFTF version table + +This table lists the version of the MFTF that was released with a particular version of Magento. + +||| +|---|---| +| Magento | MFTF | +| 2.3.1 | 2.3.13 | +| 2.3.0 | 2.3.9 | +| 2.2.8 | 2.3.13 | +| 2.2.7 | 2.3.8 | + +## Updating MFTF + +The MFTF and the Magento product have differing release cycles, with the MFTF releasing more frequently. To get the latest version of the MFTF, update the version number in `composer.json` and update the package. + +1. Open `composer.json` at the . +1. Find the MFTF listing: + + ```json + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.13.0", + "lusitanian/oauth": "~0.8.10", + "magento/magento2-functional-testing-framework": "2.3.13", + ``` + +1. Update the version number and save. +1. Run the `composer update` command. \ No newline at end of file From 3a7c942e8f8de6c79f81140fb28c1d225b091197 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Fri, 10 May 2019 11:06:36 -0500 Subject: [PATCH 2/6] Removed dupe upgrade instructions. --- docs/versioning.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/docs/versioning.md b/docs/versioning.md index 55ae4dda6..6c9104230 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -67,20 +67,3 @@ This table lists the version of the MFTF that was released with a particular ver | 2.3.0 | 2.3.9 | | 2.2.8 | 2.3.13 | | 2.2.7 | 2.3.8 | - -## Updating MFTF - -The MFTF and the Magento product have differing release cycles, with the MFTF releasing more frequently. To get the latest version of the MFTF, update the version number in `composer.json` and update the package. - -1. Open `composer.json` at the . -1. Find the MFTF listing: - - ```json - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.13.0", - "lusitanian/oauth": "~0.8.10", - "magento/magento2-functional-testing-framework": "2.3.13", - ``` - -1. Update the version number and save. -1. Run the `composer update` command. \ No newline at end of file From 016332c53577d980f4cf2d973cceef89beebe5a1 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 21 May 2019 10:44:52 -0500 Subject: [PATCH 3/6] Updated title. --- docs/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/versioning.md b/docs/versioning.md index 6c9104230..c601a4a57 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -56,7 +56,7 @@ Major version **X** MUST be incremented for a release that introduces backward i A major release can also include minor and patch level changes. You must reset the patch and minor version to 0 when you change the major version. -## MFTF version table +## Magento2 - MFTF versions This table lists the version of the MFTF that was released with a particular version of Magento. From 41f8039807cabd52a235cf47d59b1e8af3ecbb71 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 21 May 2019 12:32:47 -0500 Subject: [PATCH 4/6] Update docs/versioning.md Co-Authored-By: Dmitry Shevtsov <12731225+dshevtsov@users.noreply.github.com> --- docs/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/versioning.md b/docs/versioning.md index c601a4a57..5497e339f 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -60,7 +60,7 @@ You must reset the patch and minor version to 0 when you change the major versio This table lists the version of the MFTF that was released with a particular version of Magento. -||| +|Magento version| MFTF version| |---|---| | Magento | MFTF | | 2.3.1 | 2.3.13 | From 4929a593e1c38301303895274cbcf66383664d23 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 21 May 2019 12:32:55 -0500 Subject: [PATCH 5/6] Update docs/versioning.md Co-Authored-By: Dmitry Shevtsov <12731225+dshevtsov@users.noreply.github.com> --- docs/versioning.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/versioning.md b/docs/versioning.md index 5497e339f..b40e913f9 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -62,7 +62,6 @@ This table lists the version of the MFTF that was released with a particular ver |Magento version| MFTF version| |---|---| -| Magento | MFTF | | 2.3.1 | 2.3.13 | | 2.3.0 | 2.3.9 | | 2.2.8 | 2.3.13 | From 645eb051abf7ebfd24c508e527cfbc745186ea3a Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 21 May 2019 12:33:12 -0500 Subject: [PATCH 6/6] Update docs/versioning.md Co-Authored-By: Dmitry Shevtsov <12731225+dshevtsov@users.noreply.github.com> --- docs/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/versioning.md b/docs/versioning.md index b40e913f9..660b88a40 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -56,7 +56,7 @@ Major version **X** MUST be incremented for a release that introduces backward i A major release can also include minor and patch level changes. You must reset the patch and minor version to 0 when you change the major version. -## Magento2 - MFTF versions +## Magento 2 compatibility This table lists the version of the MFTF that was released with a particular version of Magento.