update modules
This commit is contained in:
Vendored
+26
-11
@@ -9,14 +9,23 @@ const path = require("path");
|
||||
const semver = require("semver");
|
||||
const git = require("./git");
|
||||
const versions_1 = require("./versions");
|
||||
async function winInstall(version) {
|
||||
async function winInstall(version, sha) {
|
||||
let toolDir = toolCache.find('xmake', version);
|
||||
if (!toolDir) {
|
||||
const installer = await core.group('download xmake', async () => {
|
||||
const arch = os.arch() === 'x64' ? 'x64' : 'x86';
|
||||
const url = semver.gt(version, '2.2.6')
|
||||
? `https://ci.appveyor.com/api/projects/waruqi/xmake/artifacts/xmake-installer.exe?tag=v${version}&pr=false&job=Image%3A+Visual+Studio+2017%3B+Platform%3A+${arch}`
|
||||
: `https://github.com/xmake-io/xmake/releases/download/v$v/xmake-v${version}.exe`;
|
||||
const installer = await core.group(`download xmake ${version}`, async () => {
|
||||
let url = "";
|
||||
if (version.startsWith("branch@")) {
|
||||
// we only use appveyor ci artifacts for branch version
|
||||
const arch = os.arch() === 'x64' ? 'x64' : 'x86';
|
||||
url = `https://ci.appveyor.com/api/projects/waruqi/xmake/artifacts/xmake-installer.exe?branch=${sha}&pr=false&job=Image%3A+Visual+Studio+2017%3B+Platform%3A+${arch}`;
|
||||
}
|
||||
else {
|
||||
// we cannot use appveyor ci artifacts, the old version links may be broken.
|
||||
const arch = os.arch() === 'x64' ? 'win64' : 'win32';
|
||||
url = semver.gt(version, '2.2.6')
|
||||
? `https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.${arch}.exe`
|
||||
: `https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.exe`;
|
||||
}
|
||||
core.info(`downloading from ${url}`);
|
||||
const file = await toolCache.downloadTool(url);
|
||||
const exe = path.format({ ...path.parse(file), ext: '.exe', base: undefined });
|
||||
@@ -24,7 +33,7 @@ async function winInstall(version) {
|
||||
core.info(`downloaded to ${exe}`);
|
||||
return exe;
|
||||
});
|
||||
toolDir = await core.group('install xmake', async () => {
|
||||
toolDir = await core.group(`install xmake ${version}`, async () => {
|
||||
const binDir = path.join(os.tmpdir(), `xmake-${version}`);
|
||||
core.info(`installing to ${binDir}`);
|
||||
await exec_1.exec(`"${installer}" /NOADMIN /S /D=${binDir}`);
|
||||
@@ -40,8 +49,8 @@ async function winInstall(version) {
|
||||
async function unixInstall(version, sha) {
|
||||
let toolDir = toolCache.find('xmake', version);
|
||||
if (!toolDir) {
|
||||
const sourceDir = await core.group('download xmake', () => git.create(sha));
|
||||
toolDir = await core.group('install xmake', async () => {
|
||||
const sourceDir = await core.group(`download xmake ${version}`, () => git.create(sha));
|
||||
toolDir = await core.group(`install xmake ${version}`, async () => {
|
||||
await exec_1.exec('make', ['build'], { cwd: sourceDir });
|
||||
const binDir = path.join(os.tmpdir(), `xmake-${version}-${sha}`);
|
||||
await exec_1.exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
|
||||
@@ -51,13 +60,19 @@ async function unixInstall(version, sha) {
|
||||
return cacheDir;
|
||||
});
|
||||
}
|
||||
core.addPath(path.join(toolDir, 'share', 'xmake'));
|
||||
// for versions 2.3.2 and above, xmake will be installed directly into the bin directory, and no script will be used to wrap it.
|
||||
if (version.startsWith("branch@") || semver.gt(version, '2.3.1')) {
|
||||
core.addPath(path.join(toolDir, 'bin'));
|
||||
}
|
||||
else {
|
||||
core.addPath(path.join(toolDir, 'share', 'xmake')); // only for <= 2.3.1
|
||||
}
|
||||
}
|
||||
async function run() {
|
||||
try {
|
||||
const { version, sha } = await versions_1.selectVersion();
|
||||
if (os.platform() === 'win32' || os.platform() === 'cygwin')
|
||||
await winInstall(version);
|
||||
await winInstall(version, sha);
|
||||
else
|
||||
await unixInstall(version, sha);
|
||||
await exec_1.exec('xmake --version');
|
||||
|
||||
Vendored
+9
-1
@@ -4,9 +4,17 @@ const core = require("@actions/core");
|
||||
const semver = require("semver");
|
||||
const git_1 = require("./git");
|
||||
async function selectVersion(version) {
|
||||
// get version string
|
||||
version = (version !== null && version !== void 0 ? version : core.getInput('xmake-version')) || 'latest';
|
||||
if (version.toLowerCase() === 'latest')
|
||||
version = '';
|
||||
// select branch
|
||||
if (version.startsWith('branch@')) {
|
||||
const branch = version.substr(7);
|
||||
core.info(`Selected xmake branch: ${branch}`);
|
||||
return { version: version, sha: branch };
|
||||
}
|
||||
// select version
|
||||
version = semver.validRange(version);
|
||||
if (!version) {
|
||||
throw new Error(`Invalid input xmake-version: ${core.getInput('xmake-version')}`);
|
||||
@@ -17,7 +25,7 @@ async function selectVersion(version) {
|
||||
throw new Error(`No matched releases of xmake-version: ${version}`);
|
||||
}
|
||||
const sha = versions[ver];
|
||||
core.info(`selected xmake v${ver} (commit: ${sha.substr(0, 8)})`);
|
||||
core.info(`Selected xmake v${ver} (commit: ${sha.substr(0, 8)})`);
|
||||
return { version: ver, sha };
|
||||
}
|
||||
exports.selectVersion = selectVersion;
|
||||
|
||||
Reference in New Issue
Block a user