wed150/github-action-setup-xmake
1
0
Fork 0
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #43 from Redbeanw44602/master

Browse Source 
Add fallback to winInstall.
This commit is contained in:
ruki
2025-10-02 19:56:13 +08:00
committed by GitHub
Unverified
parent eb8f4402d4 a69a9011c5
commit 837126f0e7
6 changed files with 5479 additions and 5552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -142,6 +142,6 @@ git branch test
git checkout test
pnpm build
pnpm release
git-commit -a -m "..."
git commit -a -m "..."
git push origin test
```
dist/index.js
Vendored
+5393 -5500
View File
File diff suppressed because one or more lines are too long
src/git.ts
+31 -16
View File
@@ -3,6 +3,7 @@ import * as io from '@actions/io';
import * as os from 'os';
import * as path from 'path';
import { Sha, RefDic, Repo } from './interfaces';
import { valid as isValidSemver } from 'semver';
function makeOpt(ref: Sha): { cwd: string } {
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
@@ -20,24 +21,38 @@ export async function lsRemote(repo: Repo): Promise<RefDic> {
});
const data: RefDic = { heads: {}, tags: {}, pull: {} };
out.split('\n').forEach((line) => {
const [ref, tag] = line.trim().split('\t');
if (ref && tag?.startsWith('refs/')) {
const tagPath = tag.split('/').splice(1);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let ldata = data as any; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
for (let i = 0; i < tagPath.length - 1; i++) {
const seg = tagPath[i];
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (typeof ldata[seg] === 'object') {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
ldata = ldata[seg]; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
} else {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
ldata = ldata[seg] = {};
const [ref, path] = line.trim().split('\t') as [Sha, string];
if (ref && path?.startsWith('refs/')) {
const tagPath = path.split('/').splice(1);
switch (tagPath[0]) {
case 'heads': {
// refs/heads/copilot/fix-6807
const head = tagPath.slice(1).join('/');
data.heads[head] = ref;
break;
}
case 'pull': {
// refs/pull/11/head
// refs/pull/11/merge
const pr = Number(tagPath[1]);
if (!data.pull[pr]) {
data.pull[pr] = {} as RefDic['pull'][number];
}
data.pull[pr][tagPath[2] as 'head' | 'merge'] = ref;
break;
}
case 'tags': {
// refs/tags/preview
// refs/tags/v3.0.3
const tag = tagPath.slice(1).join('/');
if (isValidSemver(tag)) {
data.tags[tag] = ref;
}
break;
}
default:
break;
}
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
ldata[tagPath[tagPath.length - 1]] = ref;
}
});
return data;
src/install.ts
+1 -2
View File
@@ -7,8 +7,7 @@ import { unixInstall } from './unix-install';
export async function installXmake(): Promise<void> {
const version = await selectVersion();
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
const latest = await selectVersion('latest');
await winInstall(version, latest);
await winInstall(version);
} else {
await unixInstall(version);
}
src/versions.ts
+8 -8
View File
@@ -96,11 +96,11 @@ async function selectSha(repo: Repo, sha: string): Promise<Version> {
}
}
return Promise.resolve(
new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`),
new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substring(0, 8)}`),
);
}
export async function selectVersion(version?: string): Promise<Version> {
export async function selectVersion(version?: string, _fallback: boolean = false): Promise<Version> {
// get version string
version = (version ?? core.getInput('xmake-version')) || 'latest';
if (version.toLowerCase() === 'latest') version = '';
@@ -123,20 +123,20 @@ export async function selectVersion(version?: string): Promise<Version> {
// select branch
if (version.startsWith('branch@')) {
const branch = version.substr('branch@'.length);
const branch = version.substring('branch@'.length);
ret = await selectBranch(repo, branch);
}
// select pr
if (version.startsWith('pr@')) {
const pr = Number.parseInt(version.substr('pr@'.length));
const pr = Number.parseInt(version.substring('pr@'.length));
if (Number.isNaN(pr) || pr <= 0) {
throw new Error(`Invalid pull requrest ${version.substr('pr@'.length)}, should be a positive integer`);
throw new Error(`Invalid pull requrest ${version.substring('pr@'.length)}, should be a positive integer`);
}
ret = await selectPr(repo, pr);
}
// select sha
if (version.startsWith('sha@')) {
const sha = version.substr('sha@'.length);
const sha = version.substring('sha@'.length);
ret = await selectSha(repo, sha);
}
// select version
@@ -148,9 +148,9 @@ export async function selectVersion(version?: string): Promise<Version> {
}
if (ret.type === 'local') {
core.info(`Use local xmake at '${ret.path}'`);
} else {
} else if (!_fallback) {
core.info(
`Selected xmake ${String(ret)} (commit: ${ret.sha.substr(0, 8)})` +
`Selected xmake ${String(ret)} (commit: ${ret.sha.substring(0, 8)})` +
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''),
);
}
src/win-install.ts
+32 -12
View File
@@ -9,18 +9,22 @@ import * as path from 'path';
import * as semver from 'semver';
import * as git from './git';
import { Version, GitVersion } from './interfaces';
import { selectVersion } from './versions';
import { getPlatformIdentifier } from './system';
function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
let ver = version.version;
async function getInstallerUrl(version: GitVersion, _fallback: boolean = false): Promise<string> {
const latest = (await selectVersion('latest', _fallback)) as GitVersion;
const latestVers = latest.version;
let vers = version.version;
let finalUrl: string;
switch (version.type) {
case 'heads': {
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
const latestver = latest.version;
if (ver !== 'dev' && ver !== 'master') {
ver = latestver;
if (vers !== 'dev' && vers !== 'master') {
vers = latestVers;
}
return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`;
finalUrl = `https://github.com/xmake-io/xmake/releases/download/${latestVers}/xmake-${vers}.${arch}.exe`;
break;
}
case 'pull': {
throw new Error('PR builds for windows is not supported');
@@ -30,9 +34,10 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
}
case 'tags': {
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
return semver.gt(ver, '2.2.6')
? `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.${arch}.exe`
: `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`;
finalUrl = semver.gt(vers, '2.2.6')
? `https://github.com/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.${arch}.exe`
: `https://github.com/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.exe`;
break;
}
default: {
// check that we have tested all types
@@ -40,6 +45,21 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
throw new Error('Unknown version type');
}
}
// check if the URL returns 404. If so, xmake may have just released a
// new version, causing some binaries to be temporarily unavailable, so
// we need to fallback to the previous version.
if (!_fallback) {
const head = await fetch(finalUrl, { method: 'HEAD' });
if (head.status === 404) {
const currentVers = latestVers || vers;
const previousVersion = (await selectVersion('<' + currentVers)) as GitVersion;
core.warning(
`The requested version ${currentVers} (${finalUrl}) resource is temporarily unavailable, trying to fallback to the previous version...`,
);
return await getInstallerUrl(previousVersion, true);
}
}
return finalUrl;
}
async function installFromSource(xmakeBin: string, sourceDir: string, binDir: string): Promise<void> {
@@ -47,8 +67,8 @@ async function installFromSource(xmakeBin: string, sourceDir: string, binDir: st
await exec(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
}
export async function winInstall(version: Version, latest: Version): Promise<void> {
if (version.type === 'local' || latest.type === 'local') {
export async function winInstall(version: Version): Promise<void> {
if (version.type === 'local') {
throw new Error('Local builds for windows is not supported');
}
@@ -85,7 +105,7 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
if (!toolDir) {
const installer = await core.group(`download xmake ${String(version)}`, async () => {
const url = getInstallerUrl(version, latest);
const url = await getInstallerUrl(version);
core.info(`downloading from ${url}`);
const file = await toolCache.downloadTool(url);
const exe = path.format({