Skip to content

Commit 47b390e

Browse files
authored
revert: deprecate include-pre-releases (#1523)
Partly reverts commit cfec7ce
1 parent 941dba4 commit 47b390e

5 files changed

Lines changed: 27 additions & 15 deletions

File tree

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ You can configure Release Drafter using the following key in your `.github/relea
141141
| `sort-direction` | Optional | Sort changelog in ascending or descending order. Can be one of: `ascending`, `descending`. Default: `descending`. |
142142
| `prerelease` | Optional | Whether to draft a prerelease, with changes since another prerelease (if applicable). Default `false`. |
143143
| `prerelease-identifier` | Optional | A string indicating an identifier (alpha, beta, rc, etc), to increment the prerelease version. This automatically enables `prerelease` if not already set to `true`. Default `''`. |
144+
| `include-pre-releases` | Optional | When looking for the last published release to scan changes up-to, include pre-releases. Has no effect if using `prerelease: true` (already enabled). Default `false`. |
144145
| `latest` | Optional | Mark the release as latest. Only works for published releases. Can be one of: `true`, `false`, `legacy`. Default `true`. |
145146
| `version-resolver` | Optional | Adjust the `$RESOLVED_VERSION` variable using labels. Refer to [Version Resolver](#version-resolver) to learn more about this |
146147
| `commitish` | Optional | The release target, i.e. branch or commit it should point to. Default: the ref that release-drafter runs for, e.g. `refs/heads/master` if configured to run on pushes to `master`. |
@@ -386,10 +387,11 @@ Some users like to run `update_prerelease_draft` with `publish: true`, such as p
386387

387388
> [!IMPORTANT]
388389
>
389-
> - The `include-pre-releases` config was deprecated in `v6.3.0`. See [#1515](https://github.com/release-drafter/release-drafter/pull/1515)
390390
> - `prerelease-identifier` is not required when `prerelease` is enabled, but your prerelease will be named after / be associated with a tag that is not semver-compliant to actual prereleases.
391391
> - when specified `prerelease-identifier` enables `prerelease: true`
392392

393+
If you want your stable releases to include changes since the last prerelease instead of the last stable release use `include-pre-releases: true`. This can reduce the number of changes included in the stable release body, but diverges from the standard workflow depicted above.
394+
393395
## Projects that don't use Semantic Versioning
394396

395397
If your project doesn't follow [Semantic Versioning](https://semver.org) you can still use Release Drafter, but you may want to set the `version-template` option to customize how the `$NEXT_{PATCH,MINOR,MAJOR}_VERSION` environment variables are generated.

dist/index.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190076,6 +190076,9 @@ const { paginate } = __nccwpck_require__(50345)
190076190076
const Joi = __nccwpck_require__(81154)
190077190077
const core = __nccwpck_require__(37484)
190078190078

190079+
/**
190080+
* @see https://docs.github.com/en/graphql/reference/objects#commit
190081+
*/
190079190082
const findCommitsWithPathChangesQuery = /* GraphQL */ `
190080190083
query findCommitsWithPathChangesQuery(
190081190084
$name: String!
@@ -190536,6 +190539,14 @@ const sortReleases = (releases, tagPrefix) => {
190536190539
// GitHub API currently returns a 500 HTTP response if you attempt to fetch over 1000 releases.
190537190540
const RELEASE_COUNT_LIMIT = 1000
190538190541

190542+
/**
190543+
* Find previous releases in the repo
190544+
*
190545+
* The last stable release is used to determine the range of commits to include in the changelog,
190546+
* and to resolve the next version number.
190547+
*
190548+
* The draft release is used to determine if we should create a new release or update the existing one.
190549+
*/
190539190550
const findReleases = async ({
190540190551
context,
190541190552
targetCommitish,
@@ -190585,7 +190596,7 @@ const findReleases = async ({
190585190596
// Handle prereleases
190586190597
publishedReleases = publishedReleases.filter(
190587190598
(publishedRelease) =>
190588-
isPreRelease || includePreReleases // `includePreReleases` will be removed in future versions
190599+
isPreRelease || includePreReleases
190589190600
? publishedRelease.prerelease || !publishedRelease.prerelease // Both prerelease and regular published-releases
190590190601
: !publishedRelease.prerelease // Only regular published-releases
190591190602
)
@@ -191327,12 +191338,6 @@ const validateSchema = (context, repoConfig) => {
191327191338
config.autolabeler = []
191328191339
}
191329191340

191330-
if (config['include-pre-releases']) {
191331-
context.log.info(
191332-
"'include-pre-releases' will be deprecated in next version. Use 'prerelease: true' instead. See PR #1515 for more"
191333-
)
191334-
}
191335-
191336191341
return config
191337191342
}
191338191343

lib/commits.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ const { paginate } = require('./pagination')
44
const Joi = require('joi')
55
const core = require('@actions/core')
66

7+
/**
8+
* @see https://docs.github.com/en/graphql/reference/objects#commit
9+
*/
710
const findCommitsWithPathChangesQuery = /* GraphQL */ `
811
query findCommitsWithPathChangesQuery(
912
$name: String!

lib/releases.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ const sortReleases = (releases, tagPrefix) => {
2424
// GitHub API currently returns a 500 HTTP response if you attempt to fetch over 1000 releases.
2525
const RELEASE_COUNT_LIMIT = 1000
2626

27+
/**
28+
* Find previous releases in the repo
29+
*
30+
* The last stable release is used to determine the range of commits to include in the changelog,
31+
* and to resolve the next version number.
32+
*
33+
* The draft release is used to determine if we should create a new release or update the existing one.
34+
*/
2735
const findReleases = async ({
2836
context,
2937
targetCommitish,
@@ -73,7 +81,7 @@ const findReleases = async ({
7381
// Handle prereleases
7482
publishedReleases = publishedReleases.filter(
7583
(publishedRelease) =>
76-
isPreRelease || includePreReleases // `includePreReleases` will be removed in future versions
84+
isPreRelease || includePreReleases
7785
? publishedRelease.prerelease || !publishedRelease.prerelease // Both prerelease and regular published-releases
7886
: !publishedRelease.prerelease // Only regular published-releases
7987
)

lib/schema.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,6 @@ const validateSchema = (context, repoConfig) => {
223223
config.autolabeler = []
224224
}
225225

226-
if (config['include-pre-releases']) {
227-
context.log.info(
228-
"'include-pre-releases' will be deprecated in next version. Use 'prerelease: true' instead. See PR #1515 for more"
229-
)
230-
}
231-
232226
return config
233227
}
234228

0 commit comments

Comments
 (0)