Move run-script action to separate folder

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
zowe-actions · Feb 14, 2024 · 34ae769 · 34ae769
1 parent f09bbcf
commit 34ae769
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
   "author": "t1m0thyj",
   "license": "Apache-2.0",
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "script"
   ],
   "devDependencies": {
     "@types/jest": "^29.4.0",

diff --git a/packages/run-script/CHANGELOG.md → script/CHANGELOG.md b/packages/run-script/CHANGELOG.md → script/CHANGELOG.md
diff --git a/packages/run-script/README.md → script/README.md b/packages/run-script/README.md → script/README.md
@@ -27,7 +27,7 @@ Custom working directory to use instead of the project root.
 ## Example usage
 
 ```yaml
-- uses: octorelease/run-script@master
+- uses: octorelease/script@v1
   with:
     script: npmUpdate
 ```
diff --git a/packages/run-script/__tests__/index.test.ts → script/__tests__/index.test.ts b/packages/run-script/__tests__/index.test.ts → script/__tests__/index.test.ts
@@ -18,7 +18,7 @@ import * as fs from "fs";
 import { loadScript } from "../src/loader";
 
 describe("Run Script action", () => {
-    const scriptNames = fs.readdirSync(__dirname + "/../../../script/src").map(s => s.slice(0, s.lastIndexOf(".")));
+    const scriptNames = fs.readdirSync(__dirname + "/../scripts").map(s => s.slice(0, s.lastIndexOf(".")));
 
     for (const scriptName of scriptNames) {
         it("should load script " + scriptName, () => {

diff --git a/packages/run-script/package.json → script/package.json b/packages/run-script/package.json → script/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "tsc -b && npm run lint",
     "lint": "eslint src",
-    "pack": "node ../../esbuild.mjs",
+    "pack": "node ../esbuild.mjs",
     "test": "echo \"Error: no test specified\" && exit 1",
     "watch": "tsc -w"
   },

diff --git a/script/src/npmUpdate.ts → script/scripts/npmUpdate.ts b/script/src/npmUpdate.ts → script/scripts/npmUpdate.ts
diff --git a/script/src/prepareRelease.ts → script/scripts/prepareRelease.ts b/script/src/prepareRelease.ts → script/scripts/prepareRelease.ts
diff --git a/script/src/sonarConfig.ts → script/scripts/sonarConfig.ts b/script/src/sonarConfig.ts → script/scripts/sonarConfig.ts
diff --git a/packages/run-script/src/index.ts → script/src/index.ts b/packages/run-script/src/index.ts → script/src/index.ts
diff --git a/packages/run-script/src/loader.ts → script/src/loader.ts b/packages/run-script/src/loader.ts → script/src/loader.ts
@@ -17,9 +17,9 @@
 import { IContext } from "@octorelease/core";
 
 const SCRIPTS: { [key: string]: any } = {
-    npmUpdate: require("../../../script/src/npmUpdate"),
-    prepareRelease: require("../../../script/src/prepareRelease"),
-    sonarConfig: require("../../../script/src/sonarConfig")
+    npmUpdate: require("../scripts/npmUpdate"),
+    prepareRelease: require("../scripts/prepareRelease"),
+    sonarConfig: require("../scripts/sonarConfig")
 };
 
 // List of scripts that should only run in release branches

diff --git a/packages/run-script/src/utils.ts → script/src/utils.ts b/packages/run-script/src/utils.ts → script/src/utils.ts
diff --git a/packages/run-script/tsconfig.json → script/tsconfig.json b/packages/run-script/tsconfig.json → script/tsconfig.json
@@ -1,16 +1,16 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "./lib",
     "rootDir": "./src"
   },
   "include": ["src"],
   "references": [
     {
-      "path": "../core"
+      "path": "../packages/core"
     },
     {
-      "path": "../git"
+      "path": "../packages/git"
     }
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -32,10 +32,10 @@
       "path": "packages/npm"
     },
     {
-      "path": "packages/run-script"
+      "path": "packages/vsce"
     },
     {
-      "path": "packages/vsce"
-    }
+      "path": "script"
+    },
   ]
 }