updated github actioning & versioning script

CEbbinghaus · Feb 15, 2024 · b0f320b · b0f320b
1 parent 6023962
commit b0f320b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Update Version
       run: |
         echo -n "-$(git rev-parse --short HEAD)" >> backend/version && \
-        node util/updateVersion.js package.json lib/package.json
+        node util/versioning.mjs update package.json lib/package.json
 
     - name: Download Decky CLI
       run: |
@@ -68,7 +68,7 @@ jobs:
     - name: Update Version
       run: |
         echo -n "-$(git rev-parse --short HEAD)" >> backend/version && \
-        node util/updateVersion.js package.json lib/package.json
+        node util/versioning.mjs update package.json lib/package.json
 
     - uses: actions/setup-node@v3
       with:

diff --git a/util/build.mjs b/util/build.mjs
@@ -2,7 +2,7 @@
 import { execSync, spawnSync } from 'child_process';
 import { join, resolve } from 'path';
 import { existsSync, mkdirSync, copyFileSync, statfsSync } from 'fs';
-import { ReadPackageVersion, UpdateVersion, ResetVersion } from './versioning.mjs';
+import { Version, UpdateVersion, ResetVersion } from './versioning.mjs';
 import { Logger } from './log.mjs';
 import { exit } from 'process';
 
@@ -29,9 +29,8 @@ async function importJson(file) {
 }
 
 const { name: PluginName } = await importJson(join(basePath, "plugin.json"));
-const pluginVersion = ReadPackageVersion();
 
-Logger.Log(`Building plugin ${PluginName}@${pluginVersion}`);
+Logger.Log(`Building plugin ${PluginName}@${Version}`);
 
 if (!existsSync('plugin.json')) {
 	console.error('Build script must be run from the root of the repository.');

diff --git a/util/versioning.mjs b/util/versioning.mjs
@@ -2,18 +2,15 @@ import { readFileSync, writeFileSync } from "fs";
 import { dirname, resolve } from "path";
 import { fileURLToPath } from "url";
 
-
-let ReadPackageVersionCache = null;
-export function ReadPackageVersion() {
-	ReadPackageVersionCache = ReadPackageVersionCache ?? readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "../backend/version"), { encoding: "utf8" });
-	return ReadPackageVersionCache;
+export const Version = ReadPackageVersion();
+function ReadPackageVersion() {
+	return readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "../backend/version"), { encoding: "utf8" });
 }
 
 function WriteVersionToPackage(file, version) {
 	const pkg = JSON.parse(readFileSync(file));
 	pkg.version = version;
 	writeFileSync(file, JSON.stringify(pkg, null, "	"));
-
 }
 
 /**
@@ -32,10 +29,30 @@ export function ResetVersion(...packages) {
  * @param  {...string} packages 
  */
 export function UpdateVersion(...packages) {
-	const version = ReadPackageVersion();
-
 	for (let pkg of packages || ["package.json"]) {
 		const packagePath = resolve(pkg);
-		WriteVersionToPackage(packagePath, version);
+		WriteVersionToPackage(packagePath, Version);
+	}
+}
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+	// The script was run directly.
+
+	let files = process.argv.slice(3);
+	if (files.length == 0) {
+		files = ["package.json"];
+	}
+
+	switch (process.argv[2]) {
+		case "reset":
+			console.log(`Resetting ${files.join(", ")}`);
+			ResetVersion(...files);
+			break;
+		case "update":
+			console.log(`Updating ${files.join(", ")} to version ${Version}`);
+			UpdateVersion(...files);
+			break;
+		default:
+			console.log("Invalid argument provided. Must be one of 'reset' | 'update'");
+			process.exit(1);
 	}
 }