Skip to content

Commit

Permalink
feat: multiple version files
Browse files Browse the repository at this point in the history 
Signed-off-by: Ar Rakin <[email protected]>
  • Loading branch information
@virtual-designer
virtual-designer committed Oct 28, 2024
1 parent 5b6118e commit 4d0fc98
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 30 deletions.
41 changes: 29 additions & 12 deletions build/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35873,19 +35873,22 @@ const core = __nccwpck_require__(2186);
const github = __nccwpck_require__(5438);
const fs_1 = __nccwpck_require__(7147);
const promises_1 = __nccwpck_require__(3292);
const semver = __nccwpck_require__(1383);
const ChangeLogGenerator_1 = __nccwpck_require__(7799);
const GitClient_1 = __nccwpck_require__(9367);
const VersionManager_1 = __nccwpck_require__(1526);
function run() {
return __awaiter(this, void 0, void 0, function* () {
var _a, _b;
var _a, _b, _c;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
const allowedCommitTypes = core
.getInput("allowed-commit-types")
.split(",")
.filter(Boolean);
const versionJsonFile = core.getInput("version-json-file") || "package.json";
const versionJsonFiles = ((_a = core.getInput("version-json-file")) === null || _a === void 0 ? void 0 : _a.split(",")) || [
"package.json",
];
const versionManagerModulePath = core.getInput("version-manager-module");
const jsonTabWidth = parseInt(core.getInput("json-tab-width") || "4");
const createTag = core.getInput("create-tag") === "true";
Expand All @@ -35909,6 +35912,9 @@ function run() {
const skipCommitsRegex = skipCommitsPattern
? new RegExp(skipCommitsPattern, core.getInput("skip-commits-pattern-flags") || "gi")
: undefined;
if (versionJsonFiles.length === 0) {
throw new Error("No version file specified.");
}
core.info(`Metadata file: ${metadataFile}`);
let metadataFileJSON;
const gitClient = __addDisposableResource(env_1, new GitClient_1.default(gitPath), true);
Expand Down Expand Up @@ -35950,17 +35956,28 @@ function run() {
const versionManagerModule = versionManagerModulePath
? yield Promise.resolve(`${versionManagerModulePath}`).then(s => require(s))
: null;
const getLastVersion = (_a = versionManagerModule === null || versionManagerModule === void 0 ? void 0 : versionManagerModule.resolver) !== null && _a !== void 0 ? _a : (() => __awaiter(this, void 0, void 0, function* () {
const packageJson = JSON.parse(yield (0, promises_1.readFile)(versionJsonFile, "utf-8"));
if (!packageJson.version) {
throw new Error(`Version file "${versionJsonFile}" does not contain a version field.`);
const getLastVersion = (_b = versionManagerModule === null || versionManagerModule === void 0 ? void 0 : versionManagerModule.resolver) !== null && _b !== void 0 ? _b : (() => __awaiter(this, void 0, void 0, function* () {
let version = null;
for (const versionJsonFile of versionJsonFiles) {
const packageJson = JSON.parse(yield (0, promises_1.readFile)(versionJsonFile, "utf-8"));
if (!packageJson.version) {
throw new Error(`Version file "${versionJsonFile}" does not contain a version field.`);
}
if (!version || semver.gt(packageJson.version, version)) {
version = packageJson.version;
}
}
if (!version) {
throw new Error("No version found in version files.");
}
return packageJson.version;
return version;
}));
const updateVersion = (_b = versionManagerModule === null || versionManagerModule === void 0 ? void 0 : versionManagerModule.updater) !== null && _b !== void 0 ? _b : ((_versionManager, version) => __awaiter(this, void 0, void 0, function* () {
const packageJson = JSON.parse(yield (0, promises_1.readFile)(versionJsonFile, "utf-8"));
packageJson.version = version;
yield (0, promises_1.writeFile)(versionJsonFile, JSON.stringify(packageJson, null, jsonTabWidth) + "\n");
const updateVersion = (_c = versionManagerModule === null || versionManagerModule === void 0 ? void 0 : versionManagerModule.updater) !== null && _c !== void 0 ? _c : ((_versionManager, version) => __awaiter(this, void 0, void 0, function* () {
for (const versionJsonFile of versionJsonFiles) {
const packageJson = JSON.parse(yield (0, promises_1.readFile)(versionJsonFile, "utf-8"));
packageJson.version = version;
yield (0, promises_1.writeFile)(versionJsonFile, JSON.stringify(packageJson, null, jsonTabWidth) + "\n");
}
}));
const currentVersion = yield getLastVersion(versionManager);
core.info(`Current version: ${currentVersion}`);
Expand Down Expand Up @@ -35992,7 +36009,7 @@ function run() {
yield gitClient.add(changelogFile);
}
yield gitClient.add(metadataFile);
yield gitClient.add(versionJsonFile);
yield gitClient.add(...versionJsonFiles);
yield gitClient.commit(commitMessageFormat.replaceAll("%s", updatedVersion), gitSignOff);
}
if (createTag) {
Expand Down
56 changes: 38 additions & 18 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as core from "@actions/core";
import * as github from "@actions/github";
import { existsSync } from "fs";
import { readFile, writeFile } from "fs/promises";
import * as semver from "semver";
import ChangeLogGenerator from "./ChangeLogGenerator";
import GitClient from "./GitClient";
import VersionManager from "./VersionManager";
Expand All @@ -19,8 +20,9 @@ async function run() {
.getInput("allowed-commit-types")
.split(",")
.filter(Boolean);
const versionJsonFile =
core.getInput("version-json-file") || "package.json";
const versionJsonFiles = core.getInput("version-json-file")?.split(",") || [
"package.json",
];
const versionManagerModulePath = core.getInput("version-manager-module");
const jsonTabWidth = parseInt(core.getInput("json-tab-width") || "4");
const createTag = core.getInput("create-tag") === "true";
Expand Down Expand Up @@ -49,6 +51,10 @@ async function run() {
)
: undefined;

if (versionJsonFiles.length === 0) {
throw new Error("No version file specified.");
}

core.info(`Metadata file: ${metadataFile}`);

let metadataFileJSON: {
Expand Down Expand Up @@ -112,32 +118,46 @@ async function run() {
const getLastVersion =
versionManagerModule?.resolver ??
(async () => {
const packageJson = JSON.parse(
await readFile(versionJsonFile, "utf-8"),
);
let version: string | null = null;

if (!packageJson.version) {
throw new Error(
`Version file "${versionJsonFile}" does not contain a version field.`,
for (const versionJsonFile of versionJsonFiles) {
const packageJson = JSON.parse(
await readFile(versionJsonFile, "utf-8"),
);

if (!packageJson.version) {
throw new Error(
`Version file "${versionJsonFile}" does not contain a version field.`,
);
}

if (!version || semver.gt(packageJson.version, version)) {
version = packageJson.version;
}
}

if (!version) {
throw new Error("No version found in version files.");
}

return packageJson.version as string;
return version;
});

const updateVersion =
versionManagerModule?.updater ??
(async (_versionManager, version) => {
const packageJson = JSON.parse(
await readFile(versionJsonFile, "utf-8"),
);
for (const versionJsonFile of versionJsonFiles) {
const packageJson = JSON.parse(
await readFile(versionJsonFile, "utf-8"),
);

packageJson.version = version;
packageJson.version = version;

await writeFile(
versionJsonFile,
JSON.stringify(packageJson, null, jsonTabWidth) + "\n",
);
await writeFile(
versionJsonFile,
JSON.stringify(packageJson, null, jsonTabWidth) + "\n",
);
}
});

const currentVersion = await getLastVersion(versionManager);
Expand Down Expand Up @@ -197,7 +217,7 @@ async function run() {
}

await gitClient.add(metadataFile);
await gitClient.add(versionJsonFile);
await gitClient.add(...versionJsonFiles);
await gitClient.commit(
commitMessageFormat.replaceAll("%s", updatedVersion),
gitSignOff,
Expand Down

0 comments on commit 4d0fc98

Please sign in to comment.