deploy: d30bf16

PrestaShop · May 17, 2024 · 55af338 · 55af338
1 parent aef4c97
commit 55af338
Show file tree

Hide file tree

Showing 6 changed files with 458 additions and 4 deletions.
diff --git a/index.xml b/index.xml
@@ -51,6 +51,17 @@ Ask a maintainer from the PrestaShop Company with administrative rights on the A
  This only needs to be done once per release.</description>
     </item>
 
+    <item>
+      <title>Security patch releases</title>
+      <link>https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/security/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+
+      <guid>https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/security/</guid>
+      <description>Security patch releases Context In the past, we used to mix security fixes for major security issues and regular Pull Requests, but that made releasing new versions of PrestaShop harder. Today when there is a major security vulnerability reported, we fix it in a scoped security patch release which contains only the security fixes.
+Examples: PrestaShop 8.1.6 or PrestaShop 8.1.4
+For regular patch releases, we start from the content of the patch branch to create a new build.</description>
+    </item>
+
     <item>
       <title>How to become a committer</title>
       <link>https://www.prestashop-project.org/maintainers-guide/how-to-become-a-committer/</link>

diff --git a/maintainers-guide/processes/release/prestashop/create-build/index.html b/maintainers-guide/processes/release/prestashop/create-build/index.html
@@ -41,7 +41,7 @@
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/create-build/" /><meta property="article:section" content="maintainers-guide" />
 
-<meta property="article:modified_time" content="2023-08-07T17:36:13+02:00" />
+<meta property="article:modified_time" content="2024-05-15T21:56:59+02:00" />
 
 
 
@@ -368,6 +368,9 @@ <h2 id="3-merge-any-not-yet-merged-security-fixes-into-your-branch">3. Merge any
 <li>Add the different private temporary repositories for each Security Advisory as remotes of your local git repository.</li>
 <li>Merge each one of those PRs into your working local branch.</li>
 </ul>
+
+<div class="notices warning" >If there are security PRs to be merged, they are fixing minor security issues. Otherwise, a security release would have been done instead.</div>
+
 <h2 id="4-update-the-changelog--contributors-list">4. Update the Changelog &amp; Contributors list</h2>
 <h3 id="extract-list-of-changes-and-contributors-using-the-changelog-tool">Extract list of changes and contributors using the changelog tool</h3>
 

diff --git a/maintainers-guide/processes/release/prestashop/index.html b/maintainers-guide/processes/release/prestashop/index.html
@@ -292,6 +292,15 @@ <h2 id="prerequisites">Prerequisites</h2>
 
 <div class="notices note" >Some of steps will require special tools or access rights which are currently not accessible for maintainers outside the PrestaShop Company. A notice indicates when this is the case.</div>
 
+<h2 id="different-types-of-releases">Different types of releases</h2>
+<p>We currently have 4 kind of new releases for PrestaShop:</p>
+<ul>
+<li>security patch releases</li>
+<li>regular patch releases</li>
+<li>minor releases</li>
+<li>major releases</li>
+</ul>
+<p>Security patch releases contain security fixes for major security issues. Please read <a href="/maintainers-guide/processes/release/prestashop/security/">about them</a>.</p>
 <h2 id="process-overview">Process overview</h2>
 <ol>
 <li>
@@ -332,7 +341,7 @@ <h2 id="process-overview">Process overview</h2>
 </li>
 <li>
 <p><strong>Push your work into a build branch.</strong><br>
-<em>Allows the base branch to continue receiving merges while your build is being validated..</em></p>
+<em>Allows the base branch to continue receiving merges while your build is being validated.</em></p>
 </li>
 <li>
 <p><strong>Build and store the zip archive.</strong><br>

diff --git a/maintainers-guide/processes/release/prestashop/index.xml b/maintainers-guide/processes/release/prestashop/index.xml
@@ -18,6 +18,17 @@ Ask a maintainer from the PrestaShop Company with administrative rights on the A
  This only needs to be done once per release.</description>
     </item>
 
+    <item>
+      <title>Security patch releases</title>
+      <link>https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/security/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+
+      <guid>https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/security/</guid>
+      <description>Security patch releases Context In the past, we used to mix security fixes for major security issues and regular Pull Requests, but that made releasing new versions of PrestaShop harder. Today when there is a major security vulnerability reported, we fix it in a scoped security patch release which contains only the security fixes.
+Examples: PrestaShop 8.1.6 or PrestaShop 8.1.4
+For regular patch releases, we start from the content of the patch branch to create a new build.</description>
+    </item>
+
     <item>
       <title>Create the build</title>
       <link>https://www.prestashop-project.org/maintainers-guide/processes/release/prestashop/create-build/</link>