Skip to content

chore: Cherry-picked changes from upstream #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anurag-stepsecurity merged 1 commit into from
Jul 10, 2026
+478 −254
Merged

chore: Cherry-picked changes from upstream #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
message="chore: release v%s"
min-release-age=3
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ You can configure Release Drafter using the following key in your
| `sort-by` | Optional | Sort changelog by merged_at or title. Can be one of: `merged_at`, `title`. Default: `merged_at`. |
| `sort-direction` | Optional | Sort changelog in ascending or descending order. Can be one of: `ascending`, `descending`. Default: `descending`. |
| `prerelease` | Optional | Whether to draft a prerelease, with changes since another prerelease (if applicable). Default `false`. |
| `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 `''`. |
| `prerelease-identifier` | Optional | A string indicating an identifier (alpha, beta, rc, etc), to increment the prerelease version. This automatically enables `prerelease` when both options come from the same config location; explicit action inputs still take precedence. Default `''`. |
| `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`. |
| `latest` | Optional | Mark the release as latest. Only works for published releases. Can be one of: `true`, `false`, `legacy`. Default `true`. |
| `version-resolver` | Optional | Adjust the `$RESOLVED_VERSION` variable using labels. Refer to [Version Resolver](#version-resolver) to learn more about this |
Expand Down Expand Up @@ -501,7 +501,7 @@ first place, automation may be an acceptable risk for you too.
> - `prerelease-identifier` is not required when `prerelease` is enabled, but
> your prerelease may not be named after / be associated with a tag that is
> semver-compliant to an actual prerelease.
> - when specified, `prerelease-identifier` enables `prerelease: true`
> - when specified, `prerelease-identifier` enables `prerelease: true` if both values come from the same config location; explicit action inputs still take precedence over config file values

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
Expand Down Expand Up @@ -536,7 +536,7 @@ specified in your `release-drafter.yml` config.
| `version` | The version to be associated with the GitHub release that's created or updated. This will override any version calculated by the release-drafter. |
| `publish` | A boolean indicating whether the release being created or updated should be immediately published. This may be useful if the output of a previous workflow step determines that a new version of your project has been (or will be) released, as with [`salsify/action-detect-and-tag-new-version`](https://github.com/salsify/action-detect-and-tag-new-version). |
| `prerelease` | Whether to draft a prerelease, with changes since another prerelease (if applicable). Default `false`. |
| `prerelease-identifier` | 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 `''`. |
| `prerelease-identifier` | A string indicating an identifier (alpha, beta, rc, etc), to increment the prerelease version. This automatically enables `prerelease` when both options come from the same config location; explicit action inputs still take precedence. Default `''`. |
| `include-pre-releases` | 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`. |
| `latest` | A string indicating whether the release being created or updated should be marked as latest. |
| `commitish` | A string specifying the target branch for the release being created. |
Expand All @@ -562,4 +562,3 @@ inputs to other Actions in the workflow
| `major_version` | Major part of resolved version by [Version Resolver](#version-resolver). i.e. `6` for version `6.3.1` |
| `minor_version` | Minor part of resolved version by [Version Resolver](#version-resolver). i.e. `3` for version `6.3.1` |
| `patch_version` | Patch part of resolved version by [Version Resolver](#version-resolver). i.e. `1` for version `6.3.1` |

2 changes: 1 addition & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ inputs:
default: ''
prerelease-identifier:
description: |
A string indicating an identifier (alpha, beta, rc, etc), to increment the prerelease version. This automatically enables `prerelease` if not already set to `true`.
A string indicating an identifier (alpha, beta, rc, etc), to increment the prerelease version. This automatically enables `prerelease` when both values come from the same config location; explicit action inputs still take precedence.
required: false
default: ''
'include-pre-releases':
Expand Down
1 change: 0 additions & 1 deletion badges/coverage.svg
View file
Open in desktop

This file was deleted.

171 changes: 109 additions & 62 deletions dist/actions/drafter/run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
import { C as setFailed, D as __toESM, E as __commonJSMin, S as info, T as warning, _ as isAxiosError, a as _enum, b as error, c as number, d as stringbool, f as datetime, g as context, h as getOctokit, i as ZodDefault, l as object, m as composeConfigGet, n as escapeStringRegexp, o as array, p as paginateGraphql, r as sharedInputSchema, s as boolean, t as stringToRegex, u as string, v as axios, w as setOutput, x as getInput, y as debug } from "../../chunks/common.js";
import * as fs$1 from "node:fs";
import * as fs from "node:fs";
//#region src/stepsecurity/subscription-check.ts
async function validateSubscription$1() {
const eventPath = process.env.GITHUB_EVENT_PATH;
let repoPrivate;
if (eventPath && fs$1.existsSync(eventPath)) repoPrivate = JSON.parse(fs$1.readFileSync(eventPath, "utf8"))?.repository?.private;
const upstream = "release-drafter/release-drafter";
const action = process.env.GITHUB_ACTION_REPOSITORY;
const docsUrl = "https://docs.stepsecurity.io/actions/stepsecurity-maintained-actions";
info("");
info("\x1B[1;36mStepSecurity Maintained Action\x1B[0m");
info(`Secure drop-in replacement for ${upstream}`);
if (repoPrivate === false) info("\x1B[32m✓ Free for public repositories\x1B[0m");
info(`\u001b[36mLearn more:\u001b[0m ${docsUrl}`);
info("");
if (repoPrivate === false) return;
const serverUrl = process.env.GITHUB_SERVER_URL || "https://github.com";
const body = { action: action || "" };
if (serverUrl !== "https://github.com") body.ghes_server = serverUrl;
try {
await axios.post(`https://agent.api.stepsecurity.io/v1/github/${process.env.GITHUB_REPOSITORY}/actions/maintained-actions-subscription`, body, { timeout: 3e3 });
} catch (error$3) {
if (isAxiosError(error$3) && error$3.response?.status === 403) {
error(`\u001b[1;31mThis action requires a StepSecurity subscription for private repositories.\u001b[0m`);
error(`\u001b[31mLearn how to enable a subscription: ${docsUrl}\u001b[0m`);
process.exit(1);
}
info("Timeout or API not reachable. Continuing to next step.");
}
}
//#endregion
//#region src/actions/drafter/config/schemas/common-config.schema.ts
/**
* Configuration parameters that can be specified in both
Expand Down Expand Up @@ -918,65 +949,10 @@ var import_valid = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((expo
var mergeInputAndConfig = (params) => {
const { config: originalConfig, input } = params;
const config = structuredClone(originalConfig);
if (input.commitish) {
if (config.commitish && config.commitish !== input.commitish) info(`Input's commitish "${input.commitish}" overrides config's commitish "${config.commitish}"`);
config.commitish = input.commitish;
}
if (input.header) {
if (config.header && config.header !== input.header) info(`Input's header "${input.header}" overrides config's header "${config.header}"`);
config.header = input.header;
}
if (input.footer) {
if (config.footer && config.footer !== input.footer) info(`Input's footer "${input.footer}" overrides config's footer "${config.footer}"`);
config.footer = input.footer;
}
if (input["prerelease-identifier"]) {
if (config["prerelease-identifier"] && config["prerelease-identifier"] !== input["prerelease-identifier"]) info(`Input's prerelease-identifier "${input["prerelease-identifier"]}" overrides config's prerelease-identifier "${config["prerelease-identifier"]}"`);
config["prerelease-identifier"] = input["prerelease-identifier"];
}
if (typeof input.prerelease === "boolean") {
if (typeof config.prerelease === "boolean" && config.prerelease !== input.prerelease) info(`Input's prerelease "${input.prerelease}" overrides config's prerelease "${config.prerelease}"`);
config.prerelease = input.prerelease;
}
if (typeof input["include-pre-releases"] === "boolean") {
if (typeof config["include-pre-releases"] === "boolean" && config["include-pre-releases"] !== input["include-pre-releases"]) info(`Input's include-pre-releases "${input["include-pre-releases"]}" overrides config's include-pre-releases "${config["include-pre-releases"]}"`);
config["include-pre-releases"] = input["include-pre-releases"];
}
if (typeof input.latest === "boolean") {
if (typeof config.latest === "boolean" && config.latest !== input.latest) info(`Input's latest "${input.latest}" overrides config's latest "${config.latest}"`);
config.latest = input.latest;
}
if (config.latest && config.prerelease) {
warning("'prerelease' and 'latest' cannot be both true. Switch 'latest' to false - release will be a pre-release.");
config.latest = false;
}
if (config["prerelease-identifier"] && !config.prerelease) {
warning(`You specified a 'prerelease-identifier' (${config["prerelease-identifier"]}), but 'prerelease' is set to false. Switching to true.`);
config.prerelease = true;
}
if (input["filter-by-range"]) {
if (config["filter-by-range"] && config["filter-by-range"] !== input["filter-by-range"]) info(`Input's filter-by-range "${input["filter-by-range"]}" overrides config's filter-by-range "${config["filter-by-range"]}"`);
config["filter-by-range"] = input["filter-by-range"];
}
const commitish = config.commitish || context.ref || context.payload.ref;
const latest = typeof config.latest !== "boolean" ? true : config.latest;
const prerelease = typeof config.prerelease !== "boolean" ? false : config.prerelease;
const replacers = config.replacers.map((r) => {
try {
return {
...r,
search: stringToRegex(r.search)
};
} catch {
warning(`Bad replacer regex: '${r.search}'`);
return false;
}
}).filter((r) => !!r);
const categories = config.categories.map((cat) => {
const { label, ..._cat } = cat;
_cat.labels = [...cat.labels, label].filter(Boolean);
return _cat;
});
applyOverrides(config, input);
const { commitish, latest, prerelease } = getParsedDefaults(config);
const replacers = getTransformedReplacers(config);
const categories = getTransformedCategories(config);
const parsedConfig = {
...config,
commitish,
Expand All @@ -985,10 +961,72 @@ var mergeInputAndConfig = (params) => {
replacers,
categories
};
validateParsedConfig(parsedConfig);
return parsedConfig;
};
var applyOverrides = (config, input) => {
applyStringOverride(config, input, "commitish");
applyStringOverride(config, input, "header");
applyStringOverride(config, input, "footer");
applyStringOverride(config, input, "prerelease-identifier");
applyBooleanOverride(config, input, "prerelease");
applyBooleanOverride(config, input, "include-pre-releases");
applyBooleanOverride(config, input, "latest");
applyStringOverride(config, input, "filter-by-range");
applyStringOverride(config, input, "initial-commits-since");
applyReleaseModeOverrides(config, input);
};
var applyReleaseModeOverrides = (config, input) => {
if (config.latest && config.prerelease) {
warning("'prerelease' and 'latest' cannot be both true. Switch 'latest' to false - release will be a pre-release.");
config.latest = false;
}
const hasInputPrerelease = typeof input.prerelease === "boolean";
const hasInputPrereleaseIdentifier = !!input["prerelease-identifier"];
if (config["prerelease-identifier"] && !config.prerelease && (!hasInputPrerelease || hasInputPrereleaseIdentifier)) {
warning(`You specified a 'prerelease-identifier' (${config["prerelease-identifier"]}), but 'prerelease' is set to false. Switching to true.`);
config.prerelease = true;
}
};
var applyBooleanOverride = (config, input, key) => {
const inputValue = input[key];
if (typeof inputValue !== "boolean") return;
const configValue = config[key];
if (typeof configValue === "boolean" && configValue !== inputValue) info(`Input's ${key} "${inputValue}" overrides config's ${key} "${configValue}"`);
config[key] = inputValue;
};
var applyStringOverride = (config, input, key) => {
const inputValue = input[key];
if (!inputValue) return;
const configValue = config[key];
if (configValue && configValue !== inputValue) info(`Input's ${key} "${inputValue}" overrides config's ${key} "${configValue}"`);
config[key] = inputValue;
};
var getParsedDefaults = (config) => ({
commitish: config.commitish || context.ref || context.payload.ref,
latest: typeof config.latest !== "boolean" ? true : config.latest,
prerelease: typeof config.prerelease !== "boolean" ? false : config.prerelease
});
var getTransformedReplacers = (config) => config.replacers.map((r) => {
try {
return {
...r,
search: stringToRegex(r.search)
};
} catch {
warning(`Bad replacer regex: '${r.search}'`);
return false;
}
}).filter((r) => !!r);
var getTransformedCategories = (config) => config.categories.map((cat) => {
const { label, ..._cat } = cat;
_cat.labels = [...cat.labels, label].filter(Boolean);
return _cat;
});
var validateParsedConfig = (parsedConfig) => {
if (!parsedConfig.commitish) throw new Error("'commitish' is required. Please set 'commitish' to a valid value. (defaults to the current ref, but it seems to be undefined in this context)");
if (parsedConfig.categories.filter((category) => category.labels.length === 0).length > 1) throw new Error("Multiple categories detected with no labels. Only one category with no labels is supported for uncategorized pull requests.");
if (parsedConfig["filter-by-range"] && !(0, import_valid.default)(parsedConfig["filter-by-range"])) throw new Error(`'filter-by-range' value "${parsedConfig["filter-by-range"]}" could not be parsed as a valid semver range.`);
return parsedConfig;
};
//#endregion
//#region src/actions/drafter/config/set-action-output.ts
Expand Down Expand Up @@ -1592,12 +1630,12 @@ var VersionDescriptor = class VersionDescriptor {
if (from) {
const ver = typeof from === "object" ? this._isRelease(from) ? this._toSemver(this._stripTag(from.tag_name)) || this._toSemver(this._stripTag(from.name)) : this._toSemver(from) : this._toSemver(this._stripTag(from));
if (!ver) {
warning(`Failed to parse version from input ${from}. Defaulting to null.`);
warning(`Failed to parse version from input ${from}. Defaulting coerced version to null.`);
return null;
}
return ver;
} else {
warning(`No version input provided. Defaulting to null.`);
debug(`Building version descriptor without version input. Defaulting coerced version to null.`);
return null;
}
}
Expand Down Expand Up @@ -1642,15 +1680,23 @@ var VersionDescriptor = class VersionDescriptor {
//#region src/actions/drafter/lib/build-release-payload/get-version-info.ts
var getVersionInfo = (params) => {
const { lastRelease, config, input, versionKeyIncrement: _versionKeyIncrement } = params;
info(`Resolving version info based on:`);
info(` - last release: ${lastRelease?.tag_name || "none"}`);
info(` - version input: ${input.version || input.tag || input.name || "none"}`);
info(` - version key increment: ${_versionKeyIncrement}`);
let _localIncrement = structuredClone(_versionKeyIncrement);
info(`Coerce and parse versions from last release...`);
const versionFromLastRelease = new VersionDescriptor(lastRelease, {
tagPrefix: config["tag-prefix"],
preReleaseIdentifier: config["prerelease-identifier"]
});
info(`Parsed version from last release: ${versionFromLastRelease.version?.format() || "none"}.`);
info(`Coerce and parse versions from input...`);
const versionFromInput = new VersionDescriptor(input.version || input.tag || input.name, {
tagPrefix: config["tag-prefix"],
preReleaseIdentifier: config["prerelease-identifier"]
});
info(`Parsed version from input: ${versionFromInput.version?.format() || "none"}.`);
let referenceVersion;
if (versionFromInput.version) {
_localIncrement = "no_increment";
Expand Down Expand Up @@ -2296,6 +2342,7 @@ async function run() {
* `runner.ts` is the entrypoint for tests and should contain all the action's
* main logic.
*/
await validateSubscription$1();
await run();
//#endregion
export {};
Loading
Loading