Merge 55c12f0 into 6fe6989

lukka · Nov 12, 2023 · 4203a34 · 4203a34
2 parents 6fe6989 + 55c12f0
commit 4203a34
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ build
 .npmrc
 coverage
 .DS_Store
-__tests__/b/
+__tests__/theAssets/
+__tests__/b
diff --git a/README.md b/README.md
@@ -176,10 +176,6 @@ Flowchart with related input in [action.yml](https://github.com/lukka/run-vcpkg/
 └─────────────┬────────────┘     to run this block.
               ▼
  ┌─────────────────────────┐   Inputs:
- │ Locate vcpkg.json.      │   - `vcpkgJsonGlob`
- └────────────┬────────────┘   - `vcpkgJsonIgnores`
-              ▼
- ┌─────────────────────────┐   Inputs:
  | Skipped by default.     |   - `vcpkgDirectory`
  │ Restore vcpkg           │   - `doNotCache`: set to false
  │ from the GH cache.      │     to run this block.
@@ -201,6 +197,10 @@ Flowchart with related input in [action.yml](https://github.com/lukka/run-vcpkg/
           ────┬────        No│   - `runVcpkgInstall`
               │ Yes          │
               ▼              │
+ ┌─────────────────────────┐ │  Inputs:
+ │ Locate vcpkg.json.      │ │  - `vcpkgJsonGlob`
+ └────────────┬────────────┘ │  - `vcpkgJsonIgnores`
+              ▼              │
  ┌─────────────────────────┐ │
  │ Launch `vcpkg install`  │ │   Inputs:
  │ where vcpkg.json has    │ │   - `runVcpkgFormatString`

diff --git a/dist/index.js b/dist/index.js
@@ -44223,12 +44223,21 @@ class ActionLib {
     exist(path) {
         return ioutil.exists(path);
     }
+    static getDefaultBinDirName() {
+        let localBinDirName = ActionLib.binDir;
+        if (process.env.RUNVCPKG_BINDIR !== undefined) {
+            if (process.env.RUNVCPKG_BINDIR.length > 0) {
+                localBinDirName = process.env.RUNVCPKG_BINDIR;
+            }
+        }
+        return localBinDirName;
+    }
     getBinDir() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!process.env.GITHUB_WORKSPACE) {
                 throw new Error("GITHUB_WORKSPACE is not set.");
             }
-            const binPath = utils.BaseUtilLib.normalizePath(path.join(process.env.GITHUB_WORKSPACE, "../b/"));
+            const binPath = utils.BaseUtilLib.normalizePath(path.join(process.env.GITHUB_WORKSPACE, ActionLib.getDefaultBinDirName()));
             yield this.mkdirP(binPath);
             return binPath;
         });
@@ -44243,17 +44252,6 @@ class ActionLib {
             return srcPath;
         });
     }
-    getArtifactsDir() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!process.env.GITHUB_WORKSPACE) {
-                throw new Error("GITHUB_WORKSPACE env var is not set.");
-            }
-            //?? HACK. How to get the value of '{{ runner.temp }}' in JS's action?
-            const artifactsPath = utils.BaseUtilLib.normalizePath(path.join(process.env.GITHUB_WORKSPACE, "../../_temp"));
-            yield this.mkdirP(artifactsPath);
-            return artifactsPath;
-        });
-    }
     beginOperation(message) {
         core.startGroup(message);
     }
@@ -44274,6 +44272,8 @@ class ActionLib {
     }
 }
 exports.ActionLib = ActionLib;
+ActionLib.binDir = "969f6665-88a2-4c98-938e-ca9259871fec";
+ActionLib.RUNVCPKG_BINDIR = "RUNVCPKG_BINDIR";
 //# sourceMappingURL=action-lib.js.map
 
 /***/ }),

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,11 +40,11 @@
     "@actions/github": "6.0.0",
     "@actions/glob": "^0.4.0",
     "@actions/io": "^1.1.3",
-    "@lukka/action-lib": "3.9.4",
-    "@lukka/assets-lib": "3.9.4",
-    "@lukka/base-lib": "3.9.4",
-    "@lukka/base-util-lib": "3.9.4",
-    "@lukka/run-vcpkg-lib": "3.9.4",
+    "@lukka/action-lib": "3.10.1",
+    "@lukka/assets-lib": "3.10.1",
+    "@lukka/base-lib": "3.10.1",
+    "@lukka/base-util-lib": "3.10.1",
+    "@lukka/run-vcpkg-lib": "3.10.1",
     "@types/adm-zip": "^0.4.32",
     "@types/follow-redirects": "^1.14.1",
     "@types/jest": "29.5.6",