Skip to content

Commit 802efed

Browse files
committed
...
1 parent 65def61 commit 802efed

File tree

6 files changed

+8922
-2304
lines changed

6 files changed

+8922
-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: 34 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,20 @@ function getInstallerUrl(version, latest) {
8285782858
}
8285882859
}
8285982860
}
82861+
async function installFromSource(xmakeBin, sourceDir, binDir) {
82862+
await (0, exec_1.exec)(xmakeBin, [], { cwd: sourceDir });
82863+
await (0, exec_1.exec)(xmakeBin, ['install', '-o', binDir], { cwd: sourceDir });
82864+
}
8286082865
async function winInstall(version, latest) {
8286182866
if (version.type === 'local' || latest.type === 'local') {
8286282867
throw new Error('Local builds for windows is not supported');
8286382868
}
82869+
/*
82870+
const actionsCacheFolder = core.getInput('actions-cache-folder');
82871+
let actionsCacheKey = core.getInput('actions-cache-key');
82872+
if (!actionsCacheKey) {
82873+
actionsCacheKey = '';
82874+
}*/
8286482875
const ver = version.version;
8286582876
let toolDir = toolCache.find('xmake', ver);
8286682877
if (!toolDir) {
@@ -82887,6 +82898,29 @@ async function winInstall(version, latest) {
8288782898
await io.rmRF(installer);
8288882899
return cacheDir;
8288982900
});
82901+
await (0, exec_1.exec)(`"${toolDir}/xmake.exe" --version`);
82902+
if (version.type === 'heads') {
82903+
const sourceDir = await core.group(`download xmake source ${String(version)}`, () => git.create(version.repo, version.sha));
82904+
toolDir = await core.group(`install xmake source ${String(version)}`, async () => {
82905+
const binDir = path.join(os.tmpdir(), `xmake-${version.sha}`);
82906+
await installFromSource(`${toolDir}/xmake.exe`, `${sourceDir}/core`, binDir);
82907+
const cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
82908+
/*
82909+
let cacheDir = '';
82910+
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
82911+
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
82912+
await io.cp(binDir, cacheDir, {
82913+
recursive: true,
82914+
});
82915+
await cache.saveCache([actionsCacheFolder], cacheKey);
82916+
} else {
82917+
cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
82918+
}*/
82919+
await io.rmRF(binDir);
82920+
await git.cleanup(version.sha);
82921+
return cacheDir;
82922+
});
82923+
}
8289082924
}
8289182925
core.addPath(toolDir);
8289282926
}

0 commit comments

Comments
 (0)