diff --git a/.releaserc.js b/.releaserc.js index 0b4a0ae781..aa60e1dde7 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -45,10 +45,10 @@ async function config() { branches: [ 'release', { name: 'alpha', prerelease: true }, - { name: 'beta', prerelease: true }, + // { name: 'beta', prerelease: true }, 'next-major', - // Long-Term-Support branch of previous major version - 'release-6.x.x', + // Long-Term-Support branch + 'release-8.x.x', ], dryRun: false, debug: true, @@ -62,13 +62,13 @@ async function config() { { scope: 'no-release', release: false }, ], parserOpts: { - noteKeywords: [ 'BREAKING CHANGE', 'BREAKING CHANGES', 'BREAKING' ], + noteKeywords: ['BREAKING CHANGE'], }, }], ['@semantic-release/release-notes-generator', { preset: 'angular', parserOpts: { - noteKeywords: ['BREAKING CHANGE', 'BREAKING CHANGES', 'BREAKING'] + noteKeywords: ['BREAKING CHANGE'] }, writerOpts: { commitsSort: ['subject', 'scope'], @@ -97,8 +97,9 @@ async function config() { "@saithodev/semantic-release-backmerge", { "backmergeBranches": [ - { from: "beta", to: "alpha" }, - { from: "release", to: "beta" }, + // { from: 'beta', to: 'alpha' }, + // { from: 'release', to: 'beta' }, + { from: 'release', to: 'alpha' }, ] } ], diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ff85f1af..867c8162fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,19 +15,6 @@ Details: - Purpose: official release - Suitable environment: production -## ⚠️ [Beta Releases][log_beta] - -> ### “Please try out, we’d love your feedback!” - -These are releases that are pretty stable, but may have still some bugs to be fixed before official release. - -Details: -- Stability: *pretty stable* -- NPM channel: `@beta` -- Branch: [beta][branch_beta] -- Purpose: feature maturation -- Suitable environment: development - ## 🔥 [Alpha Releases][log_alpha] > ### “If you are curious to see what's next!” diff --git a/README.md b/README.md index c715e97ded..b0e595b071 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ --- [![Build Status](https://github.com/parse-community/parse-server/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/parse-community/parse-server/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Aalpha) -[![Build Status](https://github.com/parse-community/parse-server/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/parse-community/parse-server/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Abeta) [![Build Status](https://github.com/parse-community/parse-server/actions/workflows/ci.yml/badge.svg?branch=release)](https://github.com/parse-community/parse-server/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Arelease) [![Snyk Badge](https://snyk.io/test/github/parse-community/parse-server/badge.svg)](https://snyk.io/test/github/parse-community/parse-server) [![Coverage](https://codecov.io/github/parse-community/parse-server/branch/alpha/graph/badge.svg)](https://app.codecov.io/github/parse-community/parse-server/tree/alpha) @@ -14,7 +13,6 @@ [![Postgres Version](https://img.shields.io/badge/postgresql-13,_14,_15,_16,_17-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org) [![npm latest version](https://img.shields.io/npm/v/parse-server/latest.svg)](https://www.npmjs.com/package/parse-server) -[![npm beta version](https://img.shields.io/npm/v/parse-server/beta.svg)](https://www.npmjs.com/package/parse-server) [![npm alpha version](https://img.shields.io/npm/v/parse-server/alpha.svg)](https://www.npmjs.com/package/parse-server) [![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link] @@ -100,7 +98,7 @@ A big *thank you* 🙏 to our [sponsors](#sponsors) and [backers](#backers) who Parse Server is available in different flavors on different branches: -- The main branches are [release][log_release], [beta][log_beta] and [alpha][log_alpha]. See the [changelog overview](CHANGELOG.md) for details. +- The main branches are [release][log_release] and [alpha][log_alpha]. See the [changelog overview](CHANGELOG.md) for details. - The long-term-support (LTS) branches are named `release-.x.x`, for example `release-5.x.x`. LTS branches do not have pre-release branches. ## Long Term Support