Skip to content

Commit 15b1027

Browse files
committed
...
1 parent 65def61 commit 15b1027

File tree

6 files changed

+8947
-2304
lines changed

6 files changed

+8947
-2304
lines changed

.github/workflows/checkin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- name: install
1414
uses: wyvox/action-setup-pnpm@v3
1515
with:
16-
node-version: 20
17-
pnpm-version: 8
16+
node-version: 23
17+
pnpm-version: 9
1818
- name: build
1919
run: pnpm build
2020
- name: test

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v1
17-
- uses: xmake-io/github-action-setup-xmake@master
17+
- uses: xmake-io/github-action-setup-xmake@test
1818
with:
1919
xmake-version: ${{ matrix.version }}
2020
- name: Run tests

dist/index.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82830,6 +82830,7 @@ const toolCache = __nccwpck_require__(5561);
8283082830
const os = __nccwpck_require__(2037);
8283182831
const path = __nccwpck_require__(1017);
8283282832
const semver = __nccwpck_require__(117);
82833+
const git = __nccwpck_require__(3555);
8283382834
function getInstallerUrl(version, latest) {
8283482835
const ver = version.version;
8283582836
switch (version.type) {
@@ -82857,10 +82858,24 @@ function getInstallerUrl(version, latest) {
8285782858
}
8285882859
}
8285982860
}
82861+
async function installFromSource(xmakeBin, sourceDir, binDir) {
82862+
await (0, exec_1.exec)(xmakeBin, ['-y'], { cwd: sourceDir });
82863+
await (0, exec_1.exec)(xmakeBin, ['pack', '-y', '--formats=nsis', '--autobuild=n', '-o', binDir, '--basename=xmake', 'xmake'], {
82864+
cwd: sourceDir,
82865+
});
82866+
//await exec(xmakeBin, ['install', '-o', binDir], { cwd: sourceDir });
82867+
// xmake pack -y --formats=nsis --autobuild=n -o pack --basename=xmake xmake
82868+
}
8286082869
async function winInstall(version, latest) {
8286182870
if (version.type === 'local' || latest.type === 'local') {
8286282871
throw new Error('Local builds for windows is not supported');
8286382872
}
82873+
/*
82874+
const actionsCacheFolder = core.getInput('actions-cache-folder');
82875+
let actionsCacheKey = core.getInput('actions-cache-key');
82876+
if (!actionsCacheKey) {
82877+
actionsCacheKey = '';
82878+
}*/
8286482879
const ver = version.version;
8286582880
let toolDir = toolCache.find('xmake', ver);
8286682881
if (!toolDir) {
@@ -82887,6 +82902,37 @@ async function winInstall(version, latest) {
8288782902
await io.rmRF(installer);
8288882903
return cacheDir;
8288982904
});
82905+
await (0, exec_1.exec)(`"${toolDir}/xmake.exe" --version`);
82906+
if (version.type === 'heads') {
82907+
const sourceDir = await core.group(`download xmake source ${String(version)}`, () => git.create(version.repo, version.sha));
82908+
toolDir = await core.group(`install xmake source ${String(version)}`, async () => {
82909+
const binDir = path.join(os.tmpdir(), `xmake-${version.sha}`);
82910+
await installFromSource(`${toolDir}/xmake.exe`, `${sourceDir}/core`, 'pack');
82911+
await (0, exec_1.exec)(`"pack/xmake.exe" /NOADMIN /S /D=${binDir}`);
82912+
core.info(`installed to ${binDir}`);
82913+
const cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
82914+
await io.rmRF(binDir);
82915+
await io.rmRF('pack/xmake.exe');
82916+
return cacheDir;
82917+
//const cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
82918+
/*
82919+
let cacheDir = '';
82920+
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
82921+
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
82922+
await io.cp(binDir, cacheDir, {
82923+
recursive: true,
82924+
});
82925+
await cache.saveCache([actionsCacheFolder], cacheKey);
82926+
} else {
82927+
cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
82928+
}*/
82929+
/*
82930+
await io.rmRF(binDir);
82931+
await git.cleanup(version.sha);
82932+
return cacheDir;
82933+
*/
82934+
});
82935+
}
8289082936
}
8289182937
core.addPath(toolDir);
8289282938
}

0 commit comments

Comments
 (0)