Compare commits
14 Commits
@@ -13,12 +13,12 @@ jobs:
|
||||
cancel-in-progress: true
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v4
|
||||
- name: install
|
||||
uses: wyvox/action-setup-pnpm@v3
|
||||
with:
|
||||
node-version: 24
|
||||
pnpm-version: 10
|
||||
node-version: 23
|
||||
pnpm-version: 9
|
||||
- name: build
|
||||
run: pnpm build
|
||||
- name: test
|
||||
@@ -28,8 +28,6 @@ jobs:
|
||||
- name: 'check for uncommitted changes'
|
||||
# Ensure no changes
|
||||
run: |
|
||||
pnpm --version
|
||||
node --version
|
||||
git add .
|
||||
if ! git diff --cached --color=always --exit-code -- . ':!node_modules'; then
|
||||
echo "::error::Found changed files after build. Please run 'pnpm release' and check in all changes."
|
||||
|
||||
@@ -11,47 +11,28 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, windows-latest, windows-11-arm, macOS-latest]
|
||||
version: [latest, branch@master, branch@dev]
|
||||
os: [macOS-latest, macos-14, macos-13]
|
||||
version: [branch@test]
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: xmake-io/github-action-setup-xmake@master
|
||||
- uses: actions/checkout@v1
|
||||
- uses: xmake-io/github-action-setup-xmake@test
|
||||
with:
|
||||
xmake-version: ${{ matrix.version }}
|
||||
actions-cache-folder: '.xmake-cache'
|
||||
actions-cache-key: ${{ matrix.version }}-relative
|
||||
actions-cache-key: ${{ matrix.version }}
|
||||
build-cache: true
|
||||
build-cache-key: ${{ matrix.version }}-relative
|
||||
build-cache-key: ${{ matrix.version }}
|
||||
package-cache: true
|
||||
package-cache-key: ${{ matrix.version }}-relative
|
||||
package-cache-key: ${{ matrix.version }}
|
||||
project-path: 'tests/sample'
|
||||
|
||||
- name: Run tests with relative cache path
|
||||
- name: Run tests
|
||||
run: |
|
||||
sw_vers -productVersion
|
||||
xmake --version
|
||||
cd tests/sample
|
||||
xmake -y -vD
|
||||
xmake run
|
||||
xmake clean
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@master
|
||||
with:
|
||||
xmake-version: ${{ matrix.version }}
|
||||
actions-cache-folder: '${{ runner.temp }}/xmake-cache'
|
||||
actions-cache-key: ${{ matrix.version }}-absolute
|
||||
build-cache: true
|
||||
build-cache-key: ${{ matrix.version }}-absolute
|
||||
package-cache: true
|
||||
package-cache-key: ${{ matrix.version }}-absolute
|
||||
project-path: 'tests/sample'
|
||||
|
||||
- name: Run tests with absolute cache path
|
||||
run: |
|
||||
xmake --version
|
||||
cd tests/sample
|
||||
xmake -y -vD
|
||||
xmake run
|
||||
xmake clean
|
||||
|
||||
@@ -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
|
||||
```
|
||||
|
||||
+1
-1
@@ -36,6 +36,6 @@ inputs:
|
||||
default: ''
|
||||
|
||||
runs:
|
||||
using: 'node24'
|
||||
using: 'node20'
|
||||
main: 'dist/index.js'
|
||||
post: 'dist/index.js'
|
||||
|
||||
Vendored
+68
-113
@@ -70512,9 +70512,9 @@ const core = __nccwpck_require__(7484);
|
||||
const exec_1 = __nccwpck_require__(5236);
|
||||
const io = __nccwpck_require__(4994);
|
||||
const cache = __nccwpck_require__(5116);
|
||||
const os = __nccwpck_require__(857);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const fsutils = __nccwpck_require__(7999);
|
||||
const system_1 = __nccwpck_require__(7666);
|
||||
function getBuildTime(hours) {
|
||||
let key = 'BuildTime';
|
||||
if (hours && hours !== '') {
|
||||
@@ -70545,7 +70545,8 @@ function getProjectRootPath() {
|
||||
}
|
||||
return projectRootPath;
|
||||
}
|
||||
async function getBuildCacheKey(buildCacheTime) {
|
||||
function getBuildCacheKey(buildCacheTime) {
|
||||
var _a;
|
||||
let buildCacheKey = core.getInput('build-cache-key');
|
||||
if (!buildCacheKey) {
|
||||
buildCacheKey = '';
|
||||
@@ -70553,8 +70554,7 @@ async function getBuildCacheKey(buildCacheTime) {
|
||||
if (!buildCacheTime || buildCacheTime === '') {
|
||||
buildCacheTime = getBuildTime();
|
||||
}
|
||||
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
||||
return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${platformIdentifier}`;
|
||||
return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
|
||||
}
|
||||
async function getBuildCachePath() {
|
||||
let buildCachePath = core.getInput('build-cache-path');
|
||||
@@ -70611,7 +70611,7 @@ async function loadBuildCache() {
|
||||
if (hours < 0) {
|
||||
break;
|
||||
}
|
||||
const buildCacheKey = await getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
|
||||
const buildCacheKey = getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
|
||||
if (!fsutils.isFile(filepath)) {
|
||||
core.info(`Restore build cache path: ${fullCachePath} to ${buildCachePath}, key: ${buildCacheKey}`);
|
||||
await cache.restoreCache([buildCacheFolder], buildCacheKey);
|
||||
@@ -70644,7 +70644,7 @@ async function saveBuildCache() {
|
||||
return;
|
||||
}
|
||||
const buildCacheFolder = getBuildCacheFolder();
|
||||
const buildCacheKey = await getBuildCacheKey();
|
||||
const buildCacheKey = getBuildCacheKey();
|
||||
const buildCachePath = await getBuildCachePath();
|
||||
const hitBuildCache = !!core.getState('hitBuildCache');
|
||||
if (!hitBuildCache && buildCacheFolder && process.env.GITHUB_WORKSPACE && fsutils.isDir(buildCachePath)) {
|
||||
@@ -70713,7 +70713,6 @@ const exec_1 = __nccwpck_require__(5236);
|
||||
const io = __nccwpck_require__(4994);
|
||||
const os = __nccwpck_require__(857);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const semver_1 = __nccwpck_require__(2088);
|
||||
function makeOpt(ref) {
|
||||
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
|
||||
}
|
||||
@@ -70728,38 +70727,25 @@ async function lsRemote(repo) {
|
||||
});
|
||||
const data = { heads: {}, tags: {}, pull: {} };
|
||||
out.split('\n').forEach((line) => {
|
||||
const [ref, path] = line.trim().split('\t');
|
||||
if (ref && (path === null || path === void 0 ? void 0 : 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;
|
||||
const [ref, tag] = line.trim().split('\t');
|
||||
if (ref && (tag === null || tag === void 0 ? void 0 : tag.startsWith('refs/'))) {
|
||||
const tagPath = tag.split('/').splice(1);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
let ldata = data; // 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
|
||||
}
|
||||
case 'pull': {
|
||||
// refs/pull/11/head
|
||||
// refs/pull/11/merge
|
||||
const pr = Number(tagPath[1]);
|
||||
if (!data.pull[pr]) {
|
||||
data.pull[pr] = {};
|
||||
else {
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
||||
ldata = ldata[seg] = {};
|
||||
}
|
||||
data.pull[pr][tagPath[2]] = ref;
|
||||
break;
|
||||
}
|
||||
case 'tags': {
|
||||
// refs/tags/preview
|
||||
// refs/tags/v3.0.3
|
||||
const tag = tagPath.slice(1).join('/');
|
||||
if ((0, semver_1.valid)(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;
|
||||
@@ -70798,7 +70784,8 @@ const unix_install_1 = __nccwpck_require__(9095);
|
||||
async function installXmake() {
|
||||
const version = await (0, versions_1.selectVersion)();
|
||||
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
||||
await (0, win_install_1.winInstall)(version);
|
||||
const latest = await (0, versions_1.selectVersion)('latest');
|
||||
await (0, win_install_1.winInstall)(version, latest);
|
||||
}
|
||||
else {
|
||||
await (0, unix_install_1.unixInstall)(version);
|
||||
@@ -70845,9 +70832,9 @@ const core = __nccwpck_require__(7484);
|
||||
const exec_1 = __nccwpck_require__(5236);
|
||||
const io = __nccwpck_require__(4994);
|
||||
const cache = __nccwpck_require__(5116);
|
||||
const os = __nccwpck_require__(857);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const fsutils = __nccwpck_require__(7999);
|
||||
const system_1 = __nccwpck_require__(7666);
|
||||
function getProjectRootPath() {
|
||||
let projectRootPath = core.getInput('project-path');
|
||||
if (!projectRootPath) {
|
||||
@@ -70860,6 +70847,7 @@ function getProjectRootPath() {
|
||||
return projectRootPath;
|
||||
}
|
||||
async function getPackageCacheKey() {
|
||||
var _a;
|
||||
let packageCacheKey = core.getInput('package-cache-key');
|
||||
if (!packageCacheKey) {
|
||||
packageCacheKey = '';
|
||||
@@ -70882,8 +70870,7 @@ async function getPackageCacheKey() {
|
||||
await (0, exec_1.exec)('xmake', ['l', 'utils.ci.packageskey'], options);
|
||||
packageCacheHash = packageCacheHash.trim();
|
||||
}
|
||||
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
||||
return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${platformIdentifier}`;
|
||||
return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
|
||||
}
|
||||
async function getPackageCachePath() {
|
||||
let packageCachePath = '';
|
||||
@@ -70989,16 +70976,23 @@ if (!exports.IsPost) {
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 7666:
|
||||
/***/ 9095:
|
||||
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
||||
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.getPlatformIdentifier = getPlatformIdentifier;
|
||||
exports.unixInstall = unixInstall;
|
||||
const core = __nccwpck_require__(7484);
|
||||
const exec_1 = __nccwpck_require__(5236);
|
||||
const io = __nccwpck_require__(4994);
|
||||
const toolCache = __nccwpck_require__(3472);
|
||||
const cache = __nccwpck_require__(5116);
|
||||
const os = __nccwpck_require__(857);
|
||||
const fs = __nccwpck_require__(9896);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const semver = __nccwpck_require__(2088);
|
||||
const git = __nccwpck_require__(1243);
|
||||
async function getPlatformIdentifier() {
|
||||
var _a;
|
||||
let identifier = `${os.platform()}-${os.arch()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
|
||||
@@ -71023,32 +71017,10 @@ async function getPlatformIdentifier() {
|
||||
}
|
||||
return identifier;
|
||||
}
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 9095:
|
||||
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
||||
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.unixInstall = unixInstall;
|
||||
const core = __nccwpck_require__(7484);
|
||||
const exec_1 = __nccwpck_require__(5236);
|
||||
const io = __nccwpck_require__(4994);
|
||||
const toolCache = __nccwpck_require__(3472);
|
||||
const cache = __nccwpck_require__(5116);
|
||||
const os = __nccwpck_require__(857);
|
||||
const fs = __nccwpck_require__(9896);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const semver = __nccwpck_require__(2088);
|
||||
const git = __nccwpck_require__(1243);
|
||||
const system_1 = __nccwpck_require__(7666);
|
||||
async function install(sourceDir, binDir) {
|
||||
if (fs.existsSync(path.join(sourceDir, 'configure'))) {
|
||||
await (0, exec_1.exec)('sh', ['./configure'], { cwd: sourceDir });
|
||||
await (0, exec_1.exec)('make', ['-j6'], { cwd: sourceDir });
|
||||
await (0, exec_1.exec)('make', ['-j6', 'VERBOSE=1'], { cwd: sourceDir });
|
||||
await (0, exec_1.exec)('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
|
||||
}
|
||||
else {
|
||||
@@ -71066,10 +71038,10 @@ async function unixInstall(version) {
|
||||
if (version.type !== 'local') {
|
||||
const ver = version.version;
|
||||
const sha = version.sha;
|
||||
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
||||
const platformIdentifier = await getPlatformIdentifier();
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
||||
@@ -71096,7 +71068,7 @@ async function unixInstall(version) {
|
||||
await install(sourceDir, binDir);
|
||||
let cacheDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(binDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
@@ -71126,6 +71098,8 @@ async function unixInstall(version) {
|
||||
else {
|
||||
core.addPath(path.join(toolDir, 'share', 'xmake')); // only for <= 2.3.1
|
||||
}
|
||||
// xmake l utils.binary.deplibs /Users/ruki/.local/bin/xmake
|
||||
await (0, exec_1.exec)(`xmake l --root utils.binary.deplibs ${path.join(toolDir, 'bin', 'xmake')}`);
|
||||
}
|
||||
|
||||
|
||||
@@ -71239,9 +71213,9 @@ async function selectSha(repo, sha) {
|
||||
return selectPr(repo, Number.parseInt(pr));
|
||||
}
|
||||
}
|
||||
return Promise.resolve(new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substring(0, 8)}`));
|
||||
return Promise.resolve(new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`));
|
||||
}
|
||||
async function selectVersion(version, _fallback = false) {
|
||||
async function selectVersion(version) {
|
||||
// get version string
|
||||
version = (version !== null && version !== void 0 ? version : core.getInput('xmake-version')) || 'latest';
|
||||
if (version.toLowerCase() === 'latest')
|
||||
@@ -71262,20 +71236,20 @@ async function selectVersion(version, _fallback = false) {
|
||||
}
|
||||
// select branch
|
||||
if (version.startsWith('branch@')) {
|
||||
const branch = version.substring('branch@'.length);
|
||||
const branch = version.substr('branch@'.length);
|
||||
ret = await selectBranch(repo, branch);
|
||||
}
|
||||
// select pr
|
||||
if (version.startsWith('pr@')) {
|
||||
const pr = Number.parseInt(version.substring('pr@'.length));
|
||||
const pr = Number.parseInt(version.substr('pr@'.length));
|
||||
if (Number.isNaN(pr) || pr <= 0) {
|
||||
throw new Error(`Invalid pull requrest ${version.substring('pr@'.length)}, should be a positive integer`);
|
||||
throw new Error(`Invalid pull requrest ${version.substr('pr@'.length)}, should be a positive integer`);
|
||||
}
|
||||
ret = await selectPr(repo, pr);
|
||||
}
|
||||
// select sha
|
||||
if (version.startsWith('sha@')) {
|
||||
const sha = version.substring('sha@'.length);
|
||||
const sha = version.substr('sha@'.length);
|
||||
ret = await selectSha(repo, sha);
|
||||
}
|
||||
// select version
|
||||
@@ -71288,8 +71262,8 @@ async function selectVersion(version, _fallback = false) {
|
||||
if (ret.type === 'local') {
|
||||
core.info(`Use local xmake at '${ret.path}'`);
|
||||
}
|
||||
else if (!_fallback) {
|
||||
core.info(`Selected xmake ${String(ret)} (commit: ${ret.sha.substring(0, 8)})` +
|
||||
else {
|
||||
core.info(`Selected xmake ${String(ret)} (commit: ${ret.sha.substr(0, 8)})` +
|
||||
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''));
|
||||
}
|
||||
return ret;
|
||||
@@ -71315,21 +71289,16 @@ const fs = __nccwpck_require__(9896);
|
||||
const path = __nccwpck_require__(6928);
|
||||
const semver = __nccwpck_require__(2088);
|
||||
const git = __nccwpck_require__(1243);
|
||||
const versions_1 = __nccwpck_require__(7902);
|
||||
const system_1 = __nccwpck_require__(7666);
|
||||
async function getInstallerUrl(version, _fallback = false) {
|
||||
const latest = (await (0, versions_1.selectVersion)('latest', _fallback));
|
||||
const latestVers = latest.version;
|
||||
let vers = version.version;
|
||||
let finalUrl;
|
||||
function getInstallerUrl(version, latest) {
|
||||
let ver = version.version;
|
||||
switch (version.type) {
|
||||
case 'heads': {
|
||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||
if (vers !== 'dev' && vers !== 'master') {
|
||||
vers = latestVers;
|
||||
const latestver = latest.version;
|
||||
if (ver !== 'dev' && ver !== 'master') {
|
||||
ver = latestver;
|
||||
}
|
||||
finalUrl = `https://github.com/xmake-io/xmake/releases/download/${latestVers}/xmake-${vers}.${arch}.exe`;
|
||||
break;
|
||||
return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`;
|
||||
}
|
||||
case 'pull': {
|
||||
throw new Error('PR builds for windows is not supported');
|
||||
@@ -71339,10 +71308,9 @@ async function getInstallerUrl(version, _fallback = false) {
|
||||
}
|
||||
case 'tags': {
|
||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||
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;
|
||||
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`;
|
||||
}
|
||||
default: {
|
||||
// check that we have tested all types
|
||||
@@ -71350,26 +71318,14 @@ async function getInstallerUrl(version, _fallback = false) {
|
||||
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 (0, versions_1.selectVersion)('<' + currentVers));
|
||||
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, sourceDir, binDir) {
|
||||
await (0, exec_1.exec)(xmakeBin, ['-y'], { cwd: sourceDir });
|
||||
await (0, exec_1.exec)(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
|
||||
}
|
||||
async function winInstall(version) {
|
||||
if (version.type === 'local') {
|
||||
async function winInstall(version, latest) {
|
||||
var _a;
|
||||
if (version.type === 'local' || latest.type === 'local') {
|
||||
throw new Error('Local builds for windows is not supported');
|
||||
}
|
||||
const actionsCacheFolder = core.getInput('actions-cache-folder');
|
||||
@@ -71379,23 +71335,22 @@ async function winInstall(version) {
|
||||
}
|
||||
const ver = version.version;
|
||||
const sha = version.sha;
|
||||
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${(_a = process.env.RUNNER_OS) !== null && _a !== void 0 ? _a : 'unknown'}`;
|
||||
let toolDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||
}
|
||||
catch (_a) {
|
||||
catch (_b) {
|
||||
await cache.restoreCache([actionsCacheFolder], cacheKey);
|
||||
}
|
||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||
toolDir = fullCachePath;
|
||||
core.info(`cache path: ${toolDir}, key: ${cacheKey}`);
|
||||
}
|
||||
catch (_b) {
|
||||
catch (_c) {
|
||||
core.warning(`No cached files found at path "${fullCachePath}".`);
|
||||
await io.rmRF(fullCachePath);
|
||||
}
|
||||
@@ -71405,7 +71360,7 @@ async function winInstall(version) {
|
||||
}
|
||||
if (!toolDir) {
|
||||
const installer = await core.group(`download xmake ${String(version)}`, async () => {
|
||||
const url = await getInstallerUrl(version);
|
||||
const url = getInstallerUrl(version, latest);
|
||||
core.info(`downloading from ${url}`);
|
||||
const file = await toolCache.downloadTool(url);
|
||||
const exe = path.format({
|
||||
@@ -71442,7 +71397,7 @@ async function winInstall(version) {
|
||||
if (toolDir) {
|
||||
let cacheDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(toolDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "github-action-setup-xmake",
|
||||
"version": "1.2.5",
|
||||
"version": "1.2.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "github-action-setup-xmake",
|
||||
"version": "1.2.5",
|
||||
"version": "1.2.1",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@actions/cache": "^4.0.3",
|
||||
|
||||
+9
-9
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "github-action-setup-xmake",
|
||||
"version": "1.2.5",
|
||||
"version": "1.2.1",
|
||||
"description": "Set up your GitHub Actions workflow with a specific version of xmake",
|
||||
"main": "dist/index.js",
|
||||
"author": "OpportunityLiu",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"repository": "https://git.soulmc.cn/wed15/github-action-setup-xmake.git",
|
||||
"homepage": "https://git.soulmc.cn/wed15/github-action-setup-xmake",
|
||||
"repository": "https://github.com/xmake-io/github-action-setup-xmake.git",
|
||||
"homepage": "https://github.com/xmake-io/github-action-setup-xmake",
|
||||
"scripts": {
|
||||
"watch": "tsc --watch",
|
||||
"build": "ncc build src/index.ts",
|
||||
@@ -18,12 +18,12 @@
|
||||
"release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@actions/cache": "^5.0.5",
|
||||
"@actions/core": "^2.0.3",
|
||||
"@actions/exec": "^2.0.0",
|
||||
"@actions/io": "^2.0.0",
|
||||
"@actions/tool-cache": "^3.0.1",
|
||||
"semver": "^7.7.4"
|
||||
"@actions/cache": "^4.0.3",
|
||||
"@actions/core": "^1.11.1",
|
||||
"@actions/exec": "^1.1.1",
|
||||
"@actions/io": "^1.1.3",
|
||||
"@actions/tool-cache": "^2.0.2",
|
||||
"semver": "^7.7.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.12",
|
||||
|
||||
Generated
+374
-283
File diff suppressed because it is too large
Load Diff
+5
-6
@@ -2,9 +2,9 @@ import * as core from '@actions/core';
|
||||
import { exec, ExecOptions } from '@actions/exec';
|
||||
import * as io from '@actions/io';
|
||||
import * as cache from '@actions/cache';
|
||||
import * as os from 'os';
|
||||
import * as path from 'path';
|
||||
import * as fsutils from './fsutils';
|
||||
import { getPlatformIdentifier } from './system';
|
||||
|
||||
function getBuildTime(hours?: string): string {
|
||||
let key = 'BuildTime';
|
||||
@@ -38,7 +38,7 @@ function getProjectRootPath(): string {
|
||||
return projectRootPath;
|
||||
}
|
||||
|
||||
async function getBuildCacheKey(buildCacheTime?: string): Promise<string> {
|
||||
function getBuildCacheKey(buildCacheTime?: string): string {
|
||||
let buildCacheKey = core.getInput('build-cache-key');
|
||||
if (!buildCacheKey) {
|
||||
buildCacheKey = '';
|
||||
@@ -46,8 +46,7 @@ async function getBuildCacheKey(buildCacheTime?: string): Promise<string> {
|
||||
if (!buildCacheTime || buildCacheTime === '') {
|
||||
buildCacheTime = getBuildTime();
|
||||
}
|
||||
const platformIdentifier = await getPlatformIdentifier();
|
||||
return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${platformIdentifier}`;
|
||||
return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
|
||||
}
|
||||
|
||||
async function getBuildCachePath(): Promise<string> {
|
||||
@@ -113,7 +112,7 @@ export async function loadBuildCache(): Promise<void> {
|
||||
if (hours < 0) {
|
||||
break;
|
||||
}
|
||||
const buildCacheKey = await getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
|
||||
const buildCacheKey = getBuildCacheKey(getBuildTime(String(hours).padStart(2, '0')));
|
||||
if (!fsutils.isFile(filepath)) {
|
||||
core.info(`Restore build cache path: ${fullCachePath} to ${buildCachePath}, key: ${buildCacheKey}`);
|
||||
await cache.restoreCache([buildCacheFolder], buildCacheKey);
|
||||
@@ -148,7 +147,7 @@ export async function saveBuildCache(): Promise<void> {
|
||||
}
|
||||
|
||||
const buildCacheFolder = getBuildCacheFolder();
|
||||
const buildCacheKey = await getBuildCacheKey();
|
||||
const buildCacheKey = getBuildCacheKey();
|
||||
const buildCachePath = await getBuildCachePath();
|
||||
|
||||
const hitBuildCache = !!core.getState('hitBuildCache');
|
||||
|
||||
+16
-31
@@ -3,7 +3,6 @@ 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}`) };
|
||||
@@ -21,38 +20,24 @@ export async function lsRemote(repo: Repo): Promise<RefDic> {
|
||||
});
|
||||
const data: RefDic = { heads: {}, tags: {}, pull: {} };
|
||||
out.split('\n').forEach((line) => {
|
||||
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;
|
||||
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] = {};
|
||||
}
|
||||
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;
|
||||
|
||||
+2
-1
@@ -7,7 +7,8 @@ import { unixInstall } from './unix-install';
|
||||
export async function installXmake(): Promise<void> {
|
||||
const version = await selectVersion();
|
||||
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
||||
await winInstall(version);
|
||||
const latest = await selectVersion('latest');
|
||||
await winInstall(version, latest);
|
||||
} else {
|
||||
await unixInstall(version);
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@ import * as core from '@actions/core';
|
||||
import { exec, ExecOptions } from '@actions/exec';
|
||||
import * as io from '@actions/io';
|
||||
import * as cache from '@actions/cache';
|
||||
import * as os from 'os';
|
||||
import * as path from 'path';
|
||||
import * as fsutils from './fsutils';
|
||||
import { getPlatformIdentifier } from './system';
|
||||
|
||||
function getProjectRootPath(): string {
|
||||
let projectRootPath = core.getInput('project-path');
|
||||
@@ -41,8 +41,7 @@ async function getPackageCacheKey(): Promise<string> {
|
||||
await exec('xmake', ['l', 'utils.ci.packageskey'], options);
|
||||
packageCacheHash = packageCacheHash.trim();
|
||||
}
|
||||
const platformIdentifier = await getPlatformIdentifier();
|
||||
return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${platformIdentifier}`;
|
||||
return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
|
||||
}
|
||||
|
||||
async function getPackageCachePath(): Promise<string> {
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
import * as core from '@actions/core';
|
||||
import { exec } from '@actions/exec';
|
||||
import * as os from 'os';
|
||||
|
||||
export async function getPlatformIdentifier(): Promise<string> {
|
||||
let identifier = `${os.platform()}-${os.arch()}-${process.env.RUNNER_OS ?? 'unknown'}`;
|
||||
if (os.platform() === 'darwin') {
|
||||
let productVersion = '';
|
||||
try {
|
||||
await exec('sw_vers', ['-productVersion'], {
|
||||
silent: true,
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
productVersion = data.toString().trim();
|
||||
},
|
||||
},
|
||||
});
|
||||
if (productVersion) {
|
||||
identifier += `-${productVersion}`;
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
core.warning(
|
||||
`Failed to get macOS product version: ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
return identifier;
|
||||
}
|
||||
+31
-4
@@ -9,12 +9,36 @@ import * as path from 'path';
|
||||
import * as semver from 'semver';
|
||||
import * as git from './git';
|
||||
import { Version } from './interfaces';
|
||||
import { getPlatformIdentifier } from './system';
|
||||
|
||||
async function getPlatformIdentifier(): Promise<string> {
|
||||
let identifier = `${os.platform()}-${os.arch()}-${process.env.RUNNER_OS ?? 'unknown'}`;
|
||||
if (os.platform() === 'darwin') {
|
||||
let productVersion = '';
|
||||
try {
|
||||
await exec('sw_vers', ['-productVersion'], {
|
||||
silent: true,
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
productVersion = data.toString().trim();
|
||||
},
|
||||
},
|
||||
});
|
||||
if (productVersion) {
|
||||
identifier += `-${productVersion}`;
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
core.warning(
|
||||
`Failed to get macOS product version: ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
return identifier;
|
||||
}
|
||||
|
||||
async function install(sourceDir: string, binDir: string): Promise<void> {
|
||||
if (fs.existsSync(path.join(sourceDir, 'configure'))) {
|
||||
await exec('sh', ['./configure'], { cwd: sourceDir });
|
||||
await exec('make', ['-j6'], { cwd: sourceDir });
|
||||
await exec('make', ['-j6', 'VERBOSE=1'], { cwd: sourceDir });
|
||||
await exec('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
|
||||
} else {
|
||||
await exec('make', ['-j6'], { cwd: sourceDir });
|
||||
@@ -37,7 +61,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
||||
@@ -65,7 +89,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
||||
let cacheDir = '';
|
||||
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(binDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
@@ -92,4 +116,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
||||
} else {
|
||||
core.addPath(path.join(toolDir, 'share', 'xmake')); // only for <= 2.3.1
|
||||
}
|
||||
|
||||
// xmake l utils.binary.deplibs /Users/ruki/.local/bin/xmake
|
||||
await exec(`xmake l --root utils.binary.deplibs ${path.join(toolDir, 'bin', 'xmake')}`);
|
||||
}
|
||||
|
||||
+8
-8
@@ -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.substring(0, 8)}`),
|
||||
new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`),
|
||||
);
|
||||
}
|
||||
|
||||
export async function selectVersion(version?: string, _fallback: boolean = false): Promise<Version> {
|
||||
export async function selectVersion(version?: string): 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, _fallback: boolean = false
|
||||
|
||||
// select branch
|
||||
if (version.startsWith('branch@')) {
|
||||
const branch = version.substring('branch@'.length);
|
||||
const branch = version.substr('branch@'.length);
|
||||
ret = await selectBranch(repo, branch);
|
||||
}
|
||||
// select pr
|
||||
if (version.startsWith('pr@')) {
|
||||
const pr = Number.parseInt(version.substring('pr@'.length));
|
||||
const pr = Number.parseInt(version.substr('pr@'.length));
|
||||
if (Number.isNaN(pr) || pr <= 0) {
|
||||
throw new Error(`Invalid pull requrest ${version.substring('pr@'.length)}, should be a positive integer`);
|
||||
throw new Error(`Invalid pull requrest ${version.substr('pr@'.length)}, should be a positive integer`);
|
||||
}
|
||||
ret = await selectPr(repo, pr);
|
||||
}
|
||||
// select sha
|
||||
if (version.startsWith('sha@')) {
|
||||
const sha = version.substring('sha@'.length);
|
||||
const sha = version.substr('sha@'.length);
|
||||
ret = await selectSha(repo, sha);
|
||||
}
|
||||
// select version
|
||||
@@ -148,9 +148,9 @@ export async function selectVersion(version?: string, _fallback: boolean = false
|
||||
}
|
||||
if (ret.type === 'local') {
|
||||
core.info(`Use local xmake at '${ret.path}'`);
|
||||
} else if (!_fallback) {
|
||||
} else {
|
||||
core.info(
|
||||
`Selected xmake ${String(ret)} (commit: ${ret.sha.substring(0, 8)})` +
|
||||
`Selected xmake ${String(ret)} (commit: ${ret.sha.substr(0, 8)})` +
|
||||
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''),
|
||||
);
|
||||
}
|
||||
|
||||
+17
-37
@@ -9,22 +9,17 @@ 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';
|
||||
|
||||
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;
|
||||
function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
|
||||
let ver = version.version;
|
||||
switch (version.type) {
|
||||
case 'heads': {
|
||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||
if (vers !== 'dev' && vers !== 'master') {
|
||||
vers = latestVers;
|
||||
const latestver = latest.version;
|
||||
if (ver !== 'dev' && ver !== 'master') {
|
||||
ver = latestver;
|
||||
}
|
||||
finalUrl = `https://github.bibk.top/xmake-io/xmake/releases/download/${latestVers}/xmake-${vers}.${arch}.exe`;
|
||||
break;
|
||||
return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`;
|
||||
}
|
||||
case 'pull': {
|
||||
throw new Error('PR builds for windows is not supported');
|
||||
@@ -34,10 +29,9 @@ async function getInstallerUrl(version: GitVersion, _fallback: boolean = false):
|
||||
}
|
||||
case 'tags': {
|
||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||
finalUrl = semver.gt(vers, '2.2.6')
|
||||
? `https://github.bibk.top/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.${arch}.exe`
|
||||
: `https://github.bibk.top/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.exe`;
|
||||
break;
|
||||
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`;
|
||||
}
|
||||
default: {
|
||||
// check that we have tested all types
|
||||
@@ -45,21 +39,6 @@ async function getInstallerUrl(version: GitVersion, _fallback: boolean = false):
|
||||
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> {
|
||||
@@ -67,8 +46,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): Promise<void> {
|
||||
if (version.type === 'local') {
|
||||
export async function winInstall(version: Version, latest: Version): Promise<void> {
|
||||
if (version.type === 'local' || latest.type === 'local') {
|
||||
throw new Error('Local builds for windows is not supported');
|
||||
}
|
||||
|
||||
@@ -80,12 +59,13 @@ export async function winInstall(version: Version): Promise<void> {
|
||||
|
||||
const ver = version.version;
|
||||
const sha = version.sha;
|
||||
const platformIdentifier = await getPlatformIdentifier();
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${
|
||||
process.env.RUNNER_OS ?? 'unknown'
|
||||
}`;
|
||||
|
||||
let toolDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||
@@ -105,7 +85,7 @@ export async function winInstall(version: Version): Promise<void> {
|
||||
|
||||
if (!toolDir) {
|
||||
const installer = await core.group(`download xmake ${String(version)}`, async () => {
|
||||
const url = await getInstallerUrl(version);
|
||||
const url = getInstallerUrl(version, latest);
|
||||
core.info(`downloading from ${url}`);
|
||||
const file = await toolCache.downloadTool(url);
|
||||
const exe = path.format({
|
||||
@@ -146,7 +126,7 @@ export async function winInstall(version: Version): Promise<void> {
|
||||
if (toolDir) {
|
||||
let cacheDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(toolDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user