Skip to content

Use version-specific archive for EMSDK: #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OlegRa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use version-specific archive for EMSDK: #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
291 changes: 149 additions & 142 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,143 +5,150 @@
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {

"use strict";

var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
const core = __importStar(__nccwpck_require__(2186));
const exec = __importStar(__nccwpck_require__(1514));
const tc = __importStar(__nccwpck_require__(7784));
const cache = __importStar(__nccwpck_require__(7799));
const io = __importStar(__nccwpck_require__(7436));
const os = __importStar(__nccwpck_require__(2037));
const fs = __importStar(__nccwpck_require__(7147));
const path = __importStar(__nccwpck_require__(1017));
const matchers_1 = __nccwpck_require__(964);
function run() {
return __awaiter(this, void 0, void 0, function* () {
try {
const emArgs = {
version: yield core.getInput("version"),
noInstall: yield core.getInput("no-install"),
noCache: yield core.getInput("no-cache"),
actionsCacheFolder: yield core.getInput("actions-cache-folder"),
cacheKey: yield core.getInput("cache-key"),
// XXX: update-tags is deprecated and used for backwards compatibility.
update: (yield core.getInput("update")) || (yield core.getInput("update-tags"))
};
let emsdkFolder;
let foundInCache = false;
if (emArgs.version !== "latest" && emArgs.version !== "tot" && emArgs.noCache === "false" && !emArgs.actionsCacheFolder) {
emsdkFolder = yield tc.find('emsdk', emArgs.version, os.arch());
}
const cacheKey = emArgs.cacheKey || `${process.env.GITHUB_WORKFLOW}-${emArgs.version}-${os.platform()}-${os.arch()}`;
if (emArgs.actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder);
try {
try {
fs.accessSync(path.join(fullCachePath, 'emsdk-main', 'emsdk'), fs.constants.X_OK);
}
catch (_a) {
yield cache.restoreCache([emArgs.actionsCacheFolder], cacheKey);
}
fs.accessSync(path.join(fullCachePath, 'emsdk-main', 'emsdk'), fs.constants.X_OK);
emsdkFolder = fullCachePath;
foundInCache = true;
}
catch (_b) {
core.warning(`No cached files found at path "${fullCachePath}" - downloading and caching emsdk.`);
yield io.rmRF(fullCachePath);
// core.debug(fs.readdirSync(fullCachePath + '/emsdk-main').toString());
}
}
if (!emsdkFolder) {
const emsdkArchive = yield tc.downloadTool("https://github.com/emscripten-core/emsdk/archive/main.zip");
emsdkFolder = yield tc.extractZip(emsdkArchive);
}
else {
foundInCache = true;
}
let emsdk = path.join(emsdkFolder, 'emsdk-main', 'emsdk');
if (os.platform() === "win32") {
emsdk = `powershell ${path.join(emsdkFolder, 'emsdk-main', 'emsdk.ps1')}`;
}
if (emArgs.noInstall === "true") {
core.addPath(path.join(emsdkFolder, 'emsdk-main'));
core.exportVariable("EMSDK", path.join(emsdkFolder, 'emsdk-main'));
return;
}
if (!foundInCache) {
if (emArgs.update) {
yield exec.exec(`${emsdk} update`);
}
yield exec.exec(`${emsdk} install ${emArgs.version}`);
if (emArgs.version !== "latest" && emArgs.version !== "tot" && emArgs.noCache === "false" && !emArgs.actionsCacheFolder) {
yield tc.cacheDir(emsdkFolder, 'emsdk', emArgs.version, os.arch());
}
}
yield exec.exec(`${emsdk} activate ${emArgs.version}`);
const envListener = (message) => {
const pathResult = matchers_1.pathRegex.exec(message);
if (pathResult) {
core.addPath(pathResult[1]);
return;
}
const envResult = matchers_1.envRegex.exec(message);
if (envResult) {
core.exportVariable(envResult[1], envResult[2]);
return;
}
};
yield exec.exec(`${emsdk} construct_env`, [], { listeners: { stdline: envListener, errline: envListener } });
if (emArgs.actionsCacheFolder && !foundInCache && process.env.GITHUB_WORKSPACE) {
fs.mkdirSync(path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder), { recursive: true });
yield io.cp(path.join(emsdkFolder, 'emsdk-main'), path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder), { recursive: true });
yield cache.saveCache([emArgs.actionsCacheFolder], cacheKey);
}
}
catch (error) {
if (error &&
typeof error === "object" &&
"message" in error &&
(typeof error.message === "string" ||
error.message instanceof Error)) {
core.setFailed(error.message);
}
}
});
}
run();

var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
const core = __importStar(__nccwpck_require__(2186));
const exec = __importStar(__nccwpck_require__(1514));
const tc = __importStar(__nccwpck_require__(7784));
const cache = __importStar(__nccwpck_require__(7799));
const io = __importStar(__nccwpck_require__(7436));
const os = __importStar(__nccwpck_require__(2037));
const fs = __importStar(__nccwpck_require__(7147));
const path = __importStar(__nccwpck_require__(1017));
const matchers_1 = __nccwpck_require__(964);
function run() {
return __awaiter(this, void 0, void 0, function* () {
try {
const emArgs = {
version: yield core.getInput("version"),
noInstall: yield core.getBooleanInput("no-install"),
noCache: yield core.getBooleanInput("no-cache"),
actionsCacheFolder: yield core.getInput("actions-cache-folder"),
cacheKey: yield core.getInput("cache-key"),
// XXX: update-tags is deprecated and used for backwards compatibility.
update: (yield core.getBooleanInput("update")) || (yield core.getBooleanInput("update-tags"))
};
let emsdkFolder;
let foundInCache = false;
if (emArgs.version !== "latest" && emArgs.version !== "tot" && !emArgs.noCache && !emArgs.actionsCacheFolder) {
emsdkFolder = yield tc.find('emsdk', emArgs.version, os.arch());
}
const cacheKey = emArgs.cacheKey || `${process.env.GITHUB_WORKFLOW}-${emArgs.version}-${os.platform()}-${os.arch()}`;
if (emArgs.actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder);
try {
try {
fs.accessSync(path.join(fullCachePath, 'emsdk-main', 'emsdk'), fs.constants.X_OK);
}
catch (_a) {
yield cache.restoreCache([emArgs.actionsCacheFolder], cacheKey);
}
fs.accessSync(path.join(fullCachePath, 'emsdk-main', 'emsdk'), fs.constants.X_OK);
emsdkFolder = fullCachePath;
foundInCache = true;
}
catch (_b) {
core.warning(`No cached files found at path "${fullCachePath}" - downloading and caching emsdk.`);
yield io.rmRF(fullCachePath);
// core.debug(fs.readdirSync(fullCachePath + '/emsdk-main').toString());
}
}
if (!emsdkFolder) {
if (emArgs.version !== "latest" && emArgs.version !== "tot") {
const emsdkArchive = yield tc.downloadTool(`https://github.com/emscripten-core/emsdk/archive/${emArgs.version}.zip`);
emsdkFolder = yield tc.extractZip(emsdkArchive);
yield io.mv(path.join(emsdkFolder, `emsdk-${emArgs.version}`), path.join(emsdkFolder, 'emsdk-main'));
}
else {
const emsdkArchive = yield tc.downloadTool("https://github.com/emscripten-core/emsdk/archive/main.zip");
emsdkFolder = yield tc.extractZip(emsdkArchive);
}
}
else {
foundInCache = true;
}
let emsdk = path.join(emsdkFolder, 'emsdk-main', 'emsdk');
if (os.platform() === "win32") {
emsdk = `powershell ${path.join(emsdkFolder, 'emsdk-main', 'emsdk.ps1')}`;
}
if (emArgs.noInstall) {
core.addPath(path.join(emsdkFolder, 'emsdk-main'));
core.exportVariable("EMSDK", path.join(emsdkFolder, 'emsdk-main'));
return;
}
if (!foundInCache) {
if (emArgs.update) {
yield exec.exec(`${emsdk} update`);
}
yield exec.exec(`${emsdk} install ${emArgs.version}`);
if (emArgs.version !== "latest" && emArgs.version !== "tot" && !emArgs.noCache && !emArgs.actionsCacheFolder) {
yield tc.cacheDir(emsdkFolder, 'emsdk', emArgs.version, os.arch());
}
}
yield exec.exec(`${emsdk} activate ${emArgs.version}`);
const envListener = (message) => {
const pathResult = matchers_1.pathRegex.exec(message);
if (pathResult) {
core.addPath(pathResult[1]);
return;
}
const envResult = matchers_1.envRegex.exec(message);
if (envResult) {
core.exportVariable(envResult[1], envResult[2]);
return;
}
};
yield exec.exec(`${emsdk} construct_env`, [], { listeners: { stdline: envListener, errline: envListener } });
if (emArgs.actionsCacheFolder && !foundInCache && process.env.GITHUB_WORKSPACE) {
fs.mkdirSync(path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder), { recursive: true });
yield io.cp(path.join(emsdkFolder, 'emsdk-main'), path.join(process.env.GITHUB_WORKSPACE, emArgs.actionsCacheFolder), { recursive: true });
yield cache.saveCache([emArgs.actionsCacheFolder], cacheKey);
}
}
catch (error) {
if (error &&
typeof error === "object" &&
"message" in error &&
(typeof error.message === "string" ||
error.message instanceof Error)) {
core.setFailed(error.message);
}
}
});
}
run();


/***/ }),
Expand All @@ -150,11 +157,11 @@ run();
/***/ ((__unused_webpack_module, exports) => {

"use strict";

Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.envRegex = exports.pathRegex = void 0;
exports.pathRegex = new RegExp(/PATH \+= (.+)/);
exports.envRegex = new RegExp(/(\S+) = (.+)/);
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.envRegex = exports.pathRegex = void 0;
exports.pathRegex = new RegExp(/PATH \+= (.+)/);
exports.envRegex = new RegExp(/(\S+) = (.+)/);


/***/ }),
Expand Down
22 changes: 14 additions & 8 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ async function run() {
try {
const emArgs = {
version: await core.getInput("version"),
noInstall: await core.getInput("no-install"),
noCache: await core.getInput("no-cache"),
noInstall: await core.getBooleanInput("no-install"),
noCache: await core.getBooleanInput("no-cache"),
actionsCacheFolder: await core.getInput("actions-cache-folder"),
cacheKey: await core.getInput("cache-key"),
// XXX: update-tags is deprecated and used for backwards compatibility.
update: await core.getInput("update") || await core.getInput("update-tags")
update: await core.getBooleanInput("update") || await core.getBooleanInput("update-tags")
};

let emsdkFolder;
let foundInCache = false;

if (emArgs.version !== "latest" && emArgs.version !== "tot" && emArgs.noCache === "false" && !emArgs.actionsCacheFolder) {
if (emArgs.version !== "latest" && emArgs.version !== "tot" && !emArgs.noCache && !emArgs.actionsCacheFolder) {
emsdkFolder = await tc.find('emsdk', emArgs.version, os.arch());
}

Expand All @@ -47,8 +47,14 @@ async function run() {
}

if (!emsdkFolder) {
const emsdkArchive = await tc.downloadTool("https://github.com/emscripten-core/emsdk/archive/main.zip");
emsdkFolder = await tc.extractZip(emsdkArchive);
if (emArgs.version !== "latest" && emArgs.version !== "tot") {
const emsdkArchive = await tc.downloadTool(`https://github.com/emscripten-core/emsdk/archive/${emArgs.version}.zip`);
emsdkFolder = await tc.extractZip(emsdkArchive);
await io.mv(path.join(emsdkFolder, `emsdk-${emArgs.version}`), path.join(emsdkFolder, 'emsdk-main'));
} else {
const emsdkArchive = await tc.downloadTool("https://github.com/emscripten-core/emsdk/archive/main.zip");
emsdkFolder = await tc.extractZip(emsdkArchive);
}
} else {
foundInCache = true;
}
Expand All @@ -59,7 +65,7 @@ async function run() {
emsdk = `powershell ${path.join(emsdkFolder, 'emsdk-main', 'emsdk.ps1')}`;
}

if (emArgs.noInstall === "true") {
if (emArgs.noInstall) {
core.addPath(path.join(emsdkFolder, 'emsdk-main'));
core.exportVariable("EMSDK", path.join(emsdkFolder, 'emsdk-main'));
return;
Expand All @@ -72,7 +78,7 @@ async function run() {

await exec.exec(`${emsdk} install ${emArgs.version}`);

if (emArgs.version !== "latest" && emArgs.version !== "tot" && emArgs.noCache === "false" && !emArgs.actionsCacheFolder) {
if (emArgs.version !== "latest" && emArgs.version !== "tot" && !emArgs.noCache && !emArgs.actionsCacheFolder) {
await tc.cacheDir(emsdkFolder, 'emsdk', emArgs.version, os.arch());
}
}
Expand Down