Skip to content

Commit

Permalink
use os homde dir instead of hardcoding in the path
Browse files Browse the repository at this point in the history
  • Loading branch information
@rarmatei
rarmatei committed Jan 9, 2025
1 parent 5b26734 commit 0deb1e6
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 64 deletions.
13 changes: 12 additions & 1 deletion workflow-steps/cache/hashing-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ const fs = require('fs');
const crypto = require('crypto');
import { glob } from 'glob';

const path = require('path');
const os = require('os');

function hashFileContents(pattern: string) {
const files = glob
.sync(pattern, { ignore: 'node_modules/**' })
Expand Down Expand Up @@ -48,13 +51,21 @@ function hash(input: string) {
return crypto.createHash('sha256').update(input).digest('hex');
}

function tildePathToRelative(cachedFolderPath: string) {
if (cachedFolderPath.includes('~')) {
const expandedPath = cachedFolderPath.replace(/^~/, os.homedir());
return path.relative(process.cwd(), expandedPath);
}
return cachedFolderPath;
}

export function buildCachePaths(inputPaths: string) {
const directories = Array.from(
new Set(
inputPaths
.split('\n')
.filter((p) => p)
.map((p) => p.replace(/^~/, '..'))
.map((p) => tildePathToRelative(p))
.reduce(
(allPaths, currPath) => [...allPaths, ...expandPath(currPath)],
[],
Expand Down
64 changes: 33 additions & 31 deletions workflow-steps/cache/output/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,15 +530,15 @@ var require_minimatch = __commonJS({
"../../node_modules/minimatch/minimatch.js"(exports, module2) {
module2.exports = minimatch;
minimatch.Minimatch = Minimatch;
var path = function() {
var path2 = function() {
try {
return require("path");
} catch (e) {
}
}() || {
sep: "/"
};
minimatch.sep = path.sep;
minimatch.sep = path2.sep;
var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
var expand = require_brace_expansion();
var plTypes = {
Expand Down Expand Up @@ -629,8 +629,8 @@ var require_minimatch = __commonJS({
if (!options)
options = {};
pattern = pattern.trim();
if (!options.allowWindowsEscape && path.sep !== "/") {
pattern = pattern.split(path.sep).join("/");
if (!options.allowWindowsEscape && path2.sep !== "/") {
pattern = pattern.split(path2.sep).join("/");
}
this.options = options;
this.set = [];
Expand Down Expand Up @@ -1007,8 +1007,8 @@ var require_minimatch = __commonJS({
if (f === "/" && partial)
return true;
var options = this.options;
if (path.sep !== "/") {
f = f.split(path.sep).join("/");
if (path2.sep !== "/") {
f = f.split(path2.sep).join("/");
}
f = f.split(slashSplit);
this.debug(this.pattern, "split", f);
Expand Down Expand Up @@ -1166,12 +1166,12 @@ var require_inherits = __commonJS({
var require_path_is_absolute = __commonJS({
"../../node_modules/path-is-absolute/index.js"(exports, module2) {
"use strict";
function posix(path) {
return path.charAt(0) === "/";
function posix(path2) {
return path2.charAt(0) === "/";
}
function win32(path) {
function win32(path2) {
var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
var result = splitDeviceRe.exec(path);
var result = splitDeviceRe.exec(path2);
var device = result[1] || "";
var isUnc = Boolean(device && device.charAt(1) !== ":");
return Boolean(result[2] || isUnc);
Expand All @@ -1196,7 +1196,7 @@ var require_common = __commonJS({
return Object.prototype.hasOwnProperty.call(obj, field);
}
var fs2 = require("fs");
var path = require("path");
var path2 = require("path");
var minimatch = require_minimatch();
var isAbsolute = require_path_is_absolute();
var Minimatch = minimatch.Minimatch;
Expand Down Expand Up @@ -1261,11 +1261,11 @@ var require_common = __commonJS({
if (!ownProp(options, "cwd"))
self.cwd = cwd;
else {
self.cwd = path.resolve(options.cwd);
self.cwd = path2.resolve(options.cwd);
self.changedCwd = self.cwd !== cwd;
}
self.root = options.root || path.resolve(self.cwd, "/");
self.root = path.resolve(self.root);
self.root = options.root || path2.resolve(self.cwd, "/");
self.root = path2.resolve(self.root);
if (process.platform === "win32")
self.root = self.root.replace(/\\/g, "/");
self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd);
Expand Down Expand Up @@ -1347,30 +1347,30 @@ var require_common = __commonJS({
function makeAbs(self, f) {
var abs = f;
if (f.charAt(0) === "/") {
abs = path.join(self.root, f);
abs = path2.join(self.root, f);
} else if (isAbsolute(f) || f === "") {
abs = f;
} else if (self.changedCwd) {
abs = path.resolve(self.cwd, f);
abs = path2.resolve(self.cwd, f);
} else {
abs = path.resolve(f);
abs = path2.resolve(f);
}
if (process.platform === "win32")
abs = abs.replace(/\\/g, "/");
return abs;
}
function isIgnored(self, path2) {
function isIgnored(self, path3) {
if (!self.ignore.length)
return false;
return self.ignore.some(function(item) {
return item.matcher.match(path2) || !!(item.gmatcher && item.gmatcher.match(path2));
return item.matcher.match(path3) || !!(item.gmatcher && item.gmatcher.match(path3));
});
}
function childrenIgnored(self, path2) {
function childrenIgnored(self, path3) {
if (!self.ignore.length)
return false;
return self.ignore.some(function(item) {
return !!(item.gmatcher && item.gmatcher.match(path2));
return !!(item.gmatcher && item.gmatcher.match(path3));
});
}
}
Expand All @@ -1386,7 +1386,7 @@ var require_sync = __commonJS({
var Minimatch = minimatch.Minimatch;
var Glob = require_glob().Glob;
var util = require("util");
var path = require("path");
var path2 = require("path");
var assert2 = require("assert");
var isAbsolute = require_path_is_absolute();
var common = require_common();
Expand Down Expand Up @@ -1514,7 +1514,7 @@ var require_sync = __commonJS({
e = prefix + e;
}
if (e.charAt(0) === "/" && !this.nomount) {
e = path.join(this.root, e);
e = path2.join(this.root, e);
}
this._emitMatch(index, e);
}
Expand Down Expand Up @@ -1663,9 +1663,9 @@ var require_sync = __commonJS({
if (prefix && isAbsolute(prefix) && !this.nomount) {
var trail = /[\/\\]$/.test(prefix);
if (prefix.charAt(0) === "/") {
prefix = path.join(this.root, prefix);
prefix = path2.join(this.root, prefix);
} else {
prefix = path.resolve(this.root, prefix);
prefix = path2.resolve(this.root, prefix);
if (trail)
prefix += "/";
}
Expand Down Expand Up @@ -1860,7 +1860,7 @@ var require_glob = __commonJS({
var Minimatch = minimatch.Minimatch;
var inherits = require_inherits();
var EE = require("events").EventEmitter;
var path = require("path");
var path2 = require("path");
var assert2 = require("assert");
var isAbsolute = require_path_is_absolute();
var globSync = require_sync();
Expand Down Expand Up @@ -2143,7 +2143,7 @@ var require_glob = __commonJS({
e = prefix + e;
}
if (e.charAt(0) === "/" && !this.nomount) {
e = path.join(this.root, e);
e = path2.join(this.root, e);
}
this._emitMatch(index, e);
}
Expand Down Expand Up @@ -2330,9 +2330,9 @@ var require_glob = __commonJS({
if (prefix && isAbsolute(prefix) && !this.nomount) {
var trail = /[\/\\]$/.test(prefix);
if (prefix.charAt(0) === "/") {
prefix = path.join(this.root, prefix);
prefix = path2.join(this.root, prefix);
} else {
prefix = path.resolve(this.root, prefix);
prefix = path2.resolve(this.root, prefix);
if (trail)
prefix += "/";
}
Expand Down Expand Up @@ -5952,9 +5952,11 @@ var CacheService = {
var import_glob = __toESM(require_glob());
var fs = require("fs");
var crypto = require("crypto");
var path = require("path");
var os = require("os");
function hashFileContents(pattern) {
const files = import_glob.glob.sync(pattern, { ignore: "node_modules/**" }).filter((path) => {
return fs.statSync(path).isFile();
const files = import_glob.glob.sync(pattern, { ignore: "node_modules/**" }).filter((path2) => {
return fs.statSync(path2).isFile();
});
let megaHash = "";
files.forEach((file) => {
Expand Down
Loading

0 comments on commit 0deb1e6

Please sign in to comment.