From a0477a83005cf71756ef67c6f7072abe7bf514ab Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 23 Apr 2024 15:57:31 +0000 Subject: [PATCH] LTS: is not part of the metadata & CLI updates (#561) - LTS are listed in the table, no hint in the version number - update the RC release names - CLI updates Reviewed-on: https://codeberg.org/forgejo/docs/pulls/561 Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- docs/admin/command-line.md | 4 ++-- docs/developer/RELEASE.md | 35 ++++++++++++++++------------------- docs/user/versions.md | 8 ++------ 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/docs/admin/command-line.md b/docs/admin/command-line.md index 5ef5bca5..28c4445f 100644 --- a/docs/admin/command-line.md +++ b/docs/admin/command-line.md @@ -272,7 +272,7 @@ OPTIONS: --email value User email address --admin User is an admin (default: false) --random-password Generate a random password for the user (default: false) - --must-change-password Set this option to false to prevent forcing the user to change their password after initial login (default: true) + --must-change-password Set this option to false to prevent forcing the user to change their password after initial login --random-password-length value Length of the random password to be generated (default: 12) --access-token Generate access token for the user (default: false) --restricted Make a restricted user account (default: false) @@ -317,7 +317,7 @@ OPTIONS: --work-path value, -w value Set Forgejo's working path (defaults to the directory of the Forgejo binary) --username value, -u value The user to change password for --password value, -p value New password to set for user - --must-change-password User must change password (default: false) + --must-change-password User must change password (default: true) ``` ### admin user delete diff --git a/docs/developer/RELEASE.md b/docs/developer/RELEASE.md index 5d699a02..ca6a59d8 100644 --- a/docs/developer/RELEASE.md +++ b/docs/developer/RELEASE.md @@ -7,18 +7,18 @@ license: 'CC-BY-SA-4.0' Forgejo stable releases are published on a fixed schedule, every quarter. -| **Date** | **Version** | **Release date** | **End Of Life** | -| -------- | ---------------------- | ---------------- | ---------------- | -| 2024 Q1 | 7.0.0+LTS-gitea-1.22.0 | 23 April 2024 | **16 July 2025** | -| 2024 Q2 | X.Y.Z+gitea-A.B.C | 17 July 2024 | 16 October 2024 | -| 2024 Q3 | X.Y.Z+gitea-A.B.C | 16 October 2024 | 15 January 2025 | -| 2024 Q4 | X.Y.Z+gitea-A.B.C | 15 January 2025 | 16 April 2025 | -| 2025 Q1 | X.Y.Z+LTS-gitea-A.B.C | 16 April 2025 | **14 July 2026** | -| 2025 Q2 | X.Y.Z+gitea-A.B.C | 16 July 2025 | 15 October 2025 | -| 2025 Q3 | X.Y.Z+gitea-A.B.C | 15 October 2025 | 14 January 2026 | -| 2025 Q4 | X.Y.Z+gitea-A.B.C | 14 January 2026 | 15 April 2026 | -| 2026 Q1 | X.Y.Z+LTS-gitea-A.B.C | 15 April 2026 | **14 July 2027** | -| 2026 Q2 | X.Y.Z+gitea-A.B.C | 15 July 2026 | 14 October 2026 | +| **Date** | **Version** | **Release date** | **End Of Life** | +| -------- | ------------------------ | ---------------- | ---------------- | +| 2024 Q1 | 7.0.0+gitea-1.22.0 (LTS) | 23 April 2024 | **16 July 2025** | +| 2024 Q2 | 8.0.0+gitea-A.B.C | 17 July 2024 | 16 October 2024 | +| 2024 Q3 | X.Y.Z+gitea-A.B.C | 16 October 2024 | 15 January 2025 | +| 2024 Q4 | X.Y.Z+gitea-A.B.C | 15 January 2025 | 16 April 2025 | +| 2025 Q1 | X.Y.Z+gitea-A.B.C (LTS) | 16 April 2025 | **14 July 2026** | +| 2025 Q2 | X.Y.Z+gitea-A.B.C | 16 July 2025 | 15 October 2025 | +| 2025 Q3 | X.Y.Z+gitea-A.B.C | 15 October 2025 | 14 January 2026 | +| 2025 Q4 | X.Y.Z+gitea-A.B.C | 14 January 2026 | 15 April 2026 | +| 2026 Q1 | X.Y.Z+gitea-A.B.C (LTS) | 15 April 2026 | **14 July 2027** | +| 2026 Q2 | X.Y.Z+gitea-A.B.C | 15 July 2026 | 14 October 2026 | ### Stable release support @@ -42,14 +42,11 @@ The Forgejo release numbers are compliant with [Semantic Versioning](https://sem - Forgejo **v7.1.0+gitea-1.22.0** is compatible with Gitea **v1.22.0**. -Long term support releases have the `LTS` string in their metadata. For instance: +The release candidates are built of the stable branch and published with the **-test** suffix: -- Forgejo **v7.0.0+LTS-gitea-1.22.0** is a long term support release compatible with Gitea **v1.22.0**. - -The release candidates are composed by adding the `-rc` suffix. For instance: - -- Forgejo **v7.1.0-rc0+gitea-1.22.0** -- Forgejo **v7.1.0-rc1+gitea-1.22.0** +- Forgejo **v7.0-test** +- Forgejo **v8.0-test** +- Forgejo **v8.1-test** - etc. ## Stable release process diff --git a/docs/user/versions.md b/docs/user/versions.md index 639ab979..7f091008 100644 --- a/docs/user/versions.md +++ b/docs/user/versions.md @@ -61,16 +61,12 @@ The structure of the version number is `..+gitea-..` is conformant to [Semantic Versioning 2.0.0](https://semver.org/#semantic-versioning-200) - `gitea-` is the Gitea version this Forgejo release is compatible with -### Long Term Support (LTS) versions - -The structure is the same as stable versions, with the `LTS` string added to the metadata: `..+LTS-gitea-`. - ### Experimental and pre-release versions -The structure of the version number is `..-+gitea-`, where: +The structure of the version number is `..-dev-+gitea-`, where: - `..` is conformant to [Semantic Versioning 2.0.0](https://semver.org/#semantic-versioning-200) -- `` is the pre-release version, such as a release candidate (`RC`) +- `` is the Git SHA from which the release was built - `gitea-` is the Gitea version this Forgejo release is compatible with ## Legacy forgejo numbering scheme