Skip to content

Commit

Permalink
update distribution files
Browse files Browse the repository at this point in the history
  • Loading branch information
@planetmarshall
planetmarshall committed Dec 15, 2024
1 parent 75206fd commit 1ded0f1
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 27 deletions.
59 changes: 33 additions & 26 deletions dist/restore/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58819,7 +58819,7 @@ var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_);
var external_path_ = __nccwpck_require__(6928);
var external_path_default = /*#__PURE__*/__nccwpck_require__.n(external_path_);
// EXTERNAL MODULE: ./node_modules/@actions/core/lib/core.js
var core = __nccwpck_require__(7484);
var lib_core = __nccwpck_require__(7484);
// EXTERNAL MODULE: ./node_modules/@actions/io/lib/io.js
var io = __nccwpck_require__(4994);
// EXTERNAL MODULE: ./node_modules/@actions/exec/lib/exec.js
Expand All @@ -58830,6 +58830,11 @@ const external_process_namespaceObject = require("process");
var cache = __nccwpck_require__(5116);
;// CONCATENATED MODULE: ./src/common.ts


function getJobDurationInSeconds() {
const startTime = Number.parseInt(core.getState("startTimestamp"));
return Math.floor((Date.now() - startTime) * 0.001);
}
/**
* Parse the output of ccache --version to extract the semantic version components
* @param ccacheOutput
Expand Down Expand Up @@ -58886,44 +58891,44 @@ const SELF_CI = external_process_namespaceObject.env["CCACHE_ACTION_CI"] === "tr
// based on https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/
async function restore(ccacheVariant) {
const inputs = {
primaryKey: core.getInput("key"),
primaryKey: lib_core.getInput("key"),
// https://github.com/actions/cache/blob/73cb7e04054996a98d39095c0b7821a73fb5b3ea/src/utils/actionUtils.ts#L56
restoreKeys: core.getInput("restore-keys").split("\n").map(s => s.trim()).filter(x => x !== "")
restoreKeys: lib_core.getInput("restore-keys").split("\n").map(s => s.trim()).filter(x => x !== "")
};
const keyPrefix = ccacheVariant + "-";
const primaryKey = inputs.primaryKey ? keyPrefix + inputs.primaryKey + "-" : keyPrefix;
const restoreKeys = inputs.restoreKeys.map(k => keyPrefix + k + "-");
const paths = [cacheDir(ccacheVariant)];
core.saveState("primaryKey", primaryKey);
const shouldRestore = core.getBooleanInput("restore");
lib_core.saveState("primaryKey", primaryKey);
const shouldRestore = lib_core.getBooleanInput("restore");
if (!shouldRestore) {
core.info("Restore set to false, skip restoring cache.");
lib_core.info("Restore set to false, skip restoring cache.");
return;
}
const restoredWith = await cache.restoreCache(paths, primaryKey, restoreKeys);
if (restoredWith) {
core.info(`Restored from cache key "${restoredWith}".`);
lib_core.info(`Restored from cache key "${restoredWith}".`);
if (SELF_CI) {
core.setOutput("test-cache-hit", true);
lib_core.setOutput("test-cache-hit", true);
}
}
else {
core.info("No cache found.");
lib_core.info("No cache found.");
if (SELF_CI) {
core.setOutput("test-cache-hit", false);
lib_core.setOutput("test-cache-hit", false);
}
}
}
async function configure(ccacheVariant, platform) {
const maxSize = core.getInput('max-size');
const maxSize = lib_core.getInput('max-size');
if (ccacheVariant === "ccache") {
await execShell(`ccache --set-config=cache_dir='${cacheDir(ccacheVariant)}'`);
await execShell(`ccache --set-config=max_size='${maxSize}'`);
await execShell(`ccache --set-config=compression=true`);
if (platform === "darwin") {
await execShell(`ccache --set-config=compiler_check=content`);
}
if (core.getBooleanInput("create-symlink")) {
if (lib_core.getBooleanInput("create-symlink")) {
const ccache = await io.which("ccache");
await execShell(`ln -s ${ccache} /usr/local/bin/gcc`);
await execShell(`ln -s ${ccache} /usr/local/bin/g++`);
Expand All @@ -58934,7 +58939,7 @@ async function configure(ccacheVariant, platform) {
await execShell(`ln -s ${ccache} /usr/local/bin/emcc`);
await execShell(`ln -s ${ccache} /usr/local/bin/em++`);
}
core.info("Cccache config:");
lib_core.info("Cccache config:");
await execShell("ccache -p");
}
else {
Expand Down Expand Up @@ -58993,7 +58998,7 @@ async function installSccacheFromGitHub(version, artifactName, binSha256, binDir
const binPath = external_path_default().join(binDir, binName);
await downloadAndExtract(url, `*/${binName}`, binPath);
checkSha256Sum(binPath, binSha256);
core.addPath(binDir);
lib_core.addPath(binDir);
await execShell(`chmod +x '${binPath}'`);
}
async function downloadAndExtract(url, srcFile, dstFile) {
Expand Down Expand Up @@ -59022,13 +59027,15 @@ function checkSha256Sum(path, expectedSha256) {
}
}
async function runInner() {
const ccacheVariant = core.getInput("variant");
core.saveState("ccacheVariant", ccacheVariant);
core.saveState("shouldSave", core.getBooleanInput("save"));
core.saveState("appendTimestamp", core.getBooleanInput("append-timestamp"));
const ccacheVariant = lib_core.getInput("variant");
lib_core.saveState("startTimestamp", Date.now());
lib_core.saveState("ccacheVariant", ccacheVariant);
lib_core.saveState("evictOldFiles", lib_core.getBooleanInput("evict-old-files"));
lib_core.saveState("shouldSave", lib_core.getBooleanInput("save"));
lib_core.saveState("appendTimestamp", lib_core.getBooleanInput("append-timestamp"));
let ccachePath = await io.which(ccacheVariant);
if (!ccachePath) {
core.startGroup(`Install ${ccacheVariant}`);
lib_core.startGroup(`Install ${ccacheVariant}`);
const installer = {
["ccache,linux"]: installCcacheLinux,
["ccache,darwin"]: installCcacheMac,
Expand All @@ -59041,24 +59048,24 @@ async function runInner() {
throw Error(`Unsupported platform: ${external_process_namespaceObject.platform}`);
}
await installer();
core.info(await io.which(ccacheVariant + ".exe"));
lib_core.info(await io.which(ccacheVariant + ".exe"));
ccachePath = await io.which(ccacheVariant, true);
core.endGroup();
lib_core.endGroup();
}
core.startGroup("Restore cache");
lib_core.startGroup("Restore cache");
await restore(ccacheVariant);
core.endGroup();
core.startGroup(`Configure ${ccacheVariant}, ${external_process_namespaceObject.platform}`);
lib_core.endGroup();
lib_core.startGroup(`Configure ${ccacheVariant}, ${external_process_namespaceObject.platform}`);
await configure(ccacheVariant, external_process_namespaceObject.platform);
await execShell(`${ccacheVariant} -z`);
core.endGroup();
lib_core.endGroup();
}
async function run() {
try {
await runInner();
}
catch (error) {
core.setFailed(`Restoring cache failed: ${error}`);
lib_core.setFailed(`Restoring cache failed: ${error}`);
}
}
run();
Expand Down
21 changes: 20 additions & 1 deletion dist/save/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58803,7 +58803,8 @@ __nccwpck_require__.r(__webpack_exports__);

// EXPORTS
__nccwpck_require__.d(__webpack_exports__, {
"default": () => (/* binding */ save)
"default": () => (/* binding */ save),
evictOldFiles: () => (/* binding */ evictOldFiles)
});

// EXTERNAL MODULE: ./node_modules/@actions/core/lib/core.js
Expand All @@ -58817,6 +58818,11 @@ var external_path_ = __nccwpck_require__(6928);
var external_path_default = /*#__PURE__*/__nccwpck_require__.n(external_path_);
;// CONCATENATED MODULE: ./src/common.ts


function getJobDurationInSeconds() {
const startTime = Number.parseInt(core.getState("startTimestamp"));
return Math.floor((Date.now() - startTime) * 0.001);
}
/**
* Parse the output of ccache --version to extract the semantic version components
* @param ccacheOutput
Expand Down Expand Up @@ -58907,6 +58913,14 @@ async function hasJsonStats(ccacheVariant) {
const version = parseCCacheVersion(result.stdout);
return version != null && version[0] >= 4 && version[1] >= 10;
}
async function evictOldFiles(seconds) {
try {
await exec.exec(`ccache --evict-older-than ${seconds}s`);
}
catch (error) {
core.warning(`Error occurred evicting old cache files: ${error}`);
}
}
async function run(earlyExit) {
try {
const ccacheVariant = core.getState("ccacheVariant");
Expand Down Expand Up @@ -58939,6 +58953,11 @@ async function run(earlyExit) {
core.info("Not saving cache because 'save' is set to 'false'.");
return;
}
if (core.getState("evictOldFiles") === "true" && ccacheVariant === "ccache") {
const jobDuration = getJobDurationInSeconds();
core.debug(`Evicting cache files older than ${jobDuration} seconds`);
await evictOldFiles(jobDuration);
}
if (await ccacheIsEmpty(ccacheVariant, ccacheKnowsVerbosityFlag)) {
core.info("Not saving cache because no objects are cached.");
}
Expand Down

0 comments on commit 1ded0f1

Please sign in to comment.