Merge pull request #990 from zowe/user/markackert/fix-sigstore-bundle-links

Couple of small fixes

Author: MarkAckert

_data/releases.yml

@@ -2,8 +2,8 @@
 # Note - keep this in order as the latest release is pulled from the first item in the list!
 future:
   v3:
-    - version: 3.4.0
-      release_date: 2025-12-01
+    - version: 3.5.0
+      release_date: 2026-05-04
   v2:
     - version: 2.18.4
       release_date: 2026-08-31
@@ -21,7 +21,7 @@ v3:
     explorer_version: 3.4.0
     node_sdk_version: 3.4.0
     python_sdk_version: 3.4.0
-    release_date: 2025-01-06
+    release_date: 2026-01-06
     documentation: stable
     release_notes: v3_4_0
   - version: 3.3.1

_includes/common.html

@@ -57,19 +57,25 @@
     }
 
     function hasBundle(packageType, packageVersion) {
+        const versionParts = packageVersion.split('.');
+        const major = Number(versionParts[0]);
+        const minor = Number(versionParts[1]);
+        const patch = Number(versionParts[3]);
         switch(packageType) {
             case 'smpe':
             case 'containerization':
             case 'pswi':
             case 'pax':
-                if (packageVersion.startsWith("2.18") || packageVersion.startsWith("3.0")) {
+                if ((major === 2 && minor >= 18 ) || major >= 3) {
                     return true;
                 }
-                return false;
             case 'cli':
             case 'cli-plugins':
             case 'python-sdk':
             case 'nodejs-sdk':
+                if ((major === 2 && minor >= 18 && patch >= 1) || (major == 3 && minor >=1)) {
+                    return true;
+                }
             default:
                 return false;
         }

index.md

@@ -71,13 +71,6 @@ redirect_from:
 {% assign release_date_v1 = site.data.releases.v1[0].release_date | date: '%s' | plus: 0 %}
 {% assign week_time = 1209600 %}
 {% assign today_minus_week = currentTime | minus: week_time %}
-{% if release_date_v1 > today_minus_week %}
-  {% capture version_v1_announcements %}
-    <strong>Zowe version {{ site.data.releases.v1[0].version }} is now available. You can download the installers for this release from the <a href="/download">Download</a> page. To learn what's new in this release, see the <a href="https://docs.zowe.org/v1.28.x/getting-started/release-notes/{{ site.data.releases.v1[0].release_notes }}">Release notes</a>.</strong>
-  {% endcapture %}
-  {% assign version_v1_announcements= version_v1_announcements | split: "~" %}
-  {% assign announcements = version_v1_announcements | concat: announcements %}
-{% endif %}
 {% if release_date_v2 > today_minus_week %}
   {% capture version_v2_announcements %}
     <strong>Zowe version {{ site.data.releases.v2[0].version }} is now available. You can download the installers for this release from the <a href="/download">Download</a> page. To learn what's new in this release, see the <a href="https://docs.zowe.org/stable/getting-started/release-notes/{{ site.data.releases.v2[0].release_notes }}">Release notes</a>.</strong>
@@ -118,7 +111,7 @@ redirect_from:
 
 {% assign next_version = 2.7 %}
 {% assign next_version_date = currentTime %}
-{% assign minimum_difference = 9999999 %}
+{% assign minimum_difference = 15770000 %}  <!-- 6 months --> 
 {% for release in site.data.releases.future.v3 %}
   {% assign current_release_date = release.release_date | date: '%s' | plus: 0 %}
   {% if current_release_date > currentTime %}

post_download.md

@@ -34,7 +34,7 @@ extraJs: [common.html, post-download-script.html]
 
         <code>Verified OK</code><br /><br />
 
-        If the veritication failed, you will see:<br />
+        If the verification failed, you will see:<br />
 
         <code>Error: error verifying bundle: matching bundle to payload: ....more output</code>
         <br /><br />
@@ -54,7 +54,7 @@ extraJs: [common.html, post-download-script.html]
 
         <code>Verified OK</code><br /><br />
 
-        If the veritication failed, you will see:<br />
+        If the verification failed, you will see:<br />
 
         <code>Error: error verifying bundle: matching bundle to payload: ....more output</code>
     </details>
@@ -75,7 +75,7 @@ extraJs: [common.html, post-download-script.html]
         <ul id="sbom_bundle_download_options"></ul>
 
         <p id="sbom_verification_instructions">See the <a href="#prereqs">How to verify binaries with digital signatures</a> to acquire the pre-requisite software,
-             and for a description of online vs offline verficiation. Once you've reviewed that information, you can use the one of the below commands to digitally verify the SBOM. Each command assumes your SBOM and its respective signing bundle are in the same directory, and you have navigate your terminal there.</p>
+             and for a description of online vs offline verification. Once you've reviewed that information, you can use the one of the below commands to digitally verify the SBOM. Each command assumes your SBOM and its respective signing bundle are in the same directory, and you have navigate your terminal there.</p>
 
         <b>Online Verification</b><br />
         <code id="sbom_online_verification"></code>