Skip to content

Commit

Permalink
added review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mohini-crl committed Jan 31, 2025
1 parent 94a92ff commit 4144342
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 16 deletions.
41 changes: 30 additions & 11 deletions src/current/releases/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ As of 2024, CockroachDB is released under a staged delivery process. New release
| [v24.2](#v24-2) | Innovation | 2024-08-12 |
| [v24.1](#v24-1) | Regular | 2024-05-20 |
| [v23.2](#v23-2) | Regular | 2024-02-05 |
| [v23.1](https://www.cockroachlabs.com/docs/releases/unsupported-versions#v23-1) | Regular | 2023-05-15 |
| [v23.1](#v23-1) | Regular | 2023-05-15 |

### Upcoming releases

Expand Down Expand Up @@ -181,20 +181,38 @@ The following releases and their descriptions represent proposed plans that are
{% endif %}
{% endif %}
{% assign valid_release_date = false %}
{% if v.release_date != 'N/A' %}
{% assign valid_release_date = true %}
{% assign release_date_parsed = v.release_date | date: '%Y-%m-%d' %}
{% if release_date_parsed != '' and release_date_parsed != 'N/A' %}
{% assign valid_release_date = true %}
{% endif %}

{% assign valid_maint_date = false %}
{% if v.maint_supp_exp_date != 'N/A' and v.maint_supp_exp_date >= current_date %}
{% assign valid_maint_date = true %}
{% assign maint_date_parsed = v.maint_supp_exp_date | date: '%Y-%m-%d' %}
{% if maint_date_parsed != '' and maint_date_parsed != 'N/A' and maint_date_parsed >= current_date %}
{% assign valid_maint_date = true %}
{% endif %}

{% assign valid_asst_date = false %}
{% if v.asst_supp_exp_date == 'N/A' or v.asst_supp_exp_date >= current_date %}
{% assign valid_asst_date = true %}
{% assign asst_date_parsed = v.asst_supp_exp_date | date: '%Y-%m-%d' %}
{% if asst_date_parsed == 'N/A' or asst_date_parsed >= current_date %}
{% assign valid_asst_date = true %}
{% endif %}
{% if valid_release_date and valid_maint_date and valid_asst_date %}

{% assign valid_lts_release = false %}
{% assign lts_maint_date_parsed = v.lts_maint_supp_exp_date | date: '%Y-%m-%d' %}
{% assign lts_asst_date_parsed = v.lts_asst_supp_exp_date | date: '%Y-%m-%d' %}
{% if lts_maint_date_parsed != '' and lts_maint_date_parsed != 'N/A'
and lts_asst_date_parsed != '' and lts_asst_date_parsed != 'N/A'
and (lts_maint_date_parsed >= current_date or lts_asst_date_parsed >= current_date) %}
{% assign valid_lts_release = true %}
{% endif %}
{% assign valid_normal_release = false %}
{% if valid_release_date and valid_maint_date and valid_asst_date %}
{% assign valid_normal_release = true %}
{% endif %}


{% if valid_normal_release or valid_lts_release %}
### {{ v.major_version }}

{% if DEBUG == true %}
Expand Down Expand Up @@ -418,7 +436,7 @@ macOS downloads are **experimental**. Experimental downloads are not yet qualifi
</section>

<section class="filter-content" markdown="1" data-scope="windows">
Windows 8 or higher is required. Windows downloads are **experimental**. Experimental downloads are not yet qualified for production use and not eligible for support or uptime SLA commitments, whether they are for testing releases or production releases
Windows 8 or higher is required. Windows downloads are **experimental**. Experimental downloads are not yet qualified for production use and not eligible for support or uptime SLA commitments, whether they are for testing releases or production releases.

<table class="release-table">
<thead>
Expand Down Expand Up @@ -623,6 +641,7 @@ All binaries available on this page released prior to the release date of 24.3.0

To review the CCL, refer to the [CockroachDB Community License](https://www.cockroachlabs.com/cockroachdb-community-license) page. You can find the applicable Business Source License or third party licenses by reviewing these in the `licenses` folder for the applicable version of CockroachDB in the GitHub repository [cockroachdb/cockroach](https://github.com/cockroachdb/cockroach). See individual files for details.

## Unsupported Versions
[Here]({% link releases/unsupported-versions.md %}) are the versions of CockroachDB that are no longer supported
## Unsupported versions

Release notes for unsupported CockroachDB versions are found on [Unsupported Versions]({% link releases/unsupported-versions.md %}).

6 changes: 3 additions & 3 deletions src/current/releases/release-support-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This page explains Cockroach Labs' policy for supporting [production releases]({

There are two major release types: [Regular and Innovation releases]({% link releases/index.md %}#release-types). Each offers a unique set of Support Types, which define the durations for each [support phase](#support-phases).

## Support Phases
## Support phases

- **Maintenance Support**: Begins for a CockroachDB major version upon its [GA release]({% link releases/index.md %}#patch-releases). During this phase:
- Cockroach Labs will produce regular patch releases that include critical security fixes and resolutions to problems identified by users.
Expand All @@ -32,7 +32,7 @@ There are two major release types: [Regular and Innovation releases]({% link rel
- A Regular release reaches unsupported at the Assistance Support phase's end date.
- An Innovation releases reaches unsupported at the Maintenance Support phase's end date.

## Support Types
## Support types

### Regular releases

Expand Down Expand Up @@ -169,7 +169,7 @@ Innovation releases are not eligible for Assistance Support, and reach EOL at th
<sup id="lts-tbd">&#42;&nbsp;&nbsp;: This major version will receive LTS patch releases, which will be listed on an additional row, upon their availability.</sup><br />
<sup id="skippable">&#42;&#42;&nbsp;&nbsp;: This major version is an optional innovation release and will not receive receive LTS patch releases. Innovation releases are EOL when Maintenance Support ends.</sup><br />

## Unsupported Versions
## Unsupported versions

The following versions of CockroachDB are no longer supported.

Expand Down
25 changes: 23 additions & 2 deletions src/current/releases/unsupported-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ summary: Versions of CockroachDB that are no longer supported
toc: true
docs_area: releases
---

{{site.data.alerts.callout_danger}}
The CockroachDB versions on this page are no longer supported. For more information, refer to [Release Support Policy]({% link releases/release-support-policy.md %}#unsupported-versions). To download and learn about currently supported CockroachDB versions, refer to [CockroachDB Releases]({% link releases/index.md %}).
{{site.data.alerts.end}}
## Downloads

{{ experimental_js_warning }}
Expand Down Expand Up @@ -67,7 +69,26 @@ docs_area: releases
{% if v.asst_supp_exp_date == 'N/A' or v.asst_supp_exp_date <= current_date %}
{% assign invalid_asst_date = true %}
{% endif %}
{% if valid_release_date and invalid_maint_date and invalid_asst_date %}

{% assign is_not_lts_date = false %}
{% if v.lts_maint_supp_exp_date == 'N/A' and v.lts_asst_supp_exp_date == 'N/A' %}
{% assign is_not_lts_date = true %}
{% endif %}

{% assign invalid_lts_release = false %}
{% assign lts_maint_date_parsed = v.lts_maint_supp_exp_date | date: '%Y-%m-%d' %}
{% assign lts_asst_date_parsed = v.lts_asst_supp_exp_date | date: '%Y-%m-%d' %}
{% if lts_maint_date_parsed != '' and lts_maint_date_parsed != 'N/A'
and lts_asst_date_parsed != '' and lts_asst_date_parsed != 'N/A'
and (lts_maint_date_parsed <= current_date and lts_asst_date_parsed <= current_date) %}
{% assign invalid_lts_release = true %}
{% endif %}
{% assign invalid_normal_release = false %}
{% if valid_release_date and invalid_maint_date and invalid_asst_date %}
{% assign invalid_normal_release = true %}
{% endif %}

{% if (invalid_normal_release and is_not_lts_date) or invalid_lts_release %}
### {{ v.major_version }}

{% if DEBUG == true %}
Expand Down

0 comments on commit 4144342

Please sign in to comment.