Compare commits
18 Commits
@@ -13,12 +13,12 @@ jobs:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- name: install
|
- name: install
|
||||||
uses: wyvox/action-setup-pnpm@v3
|
uses: wyvox/action-setup-pnpm@v3
|
||||||
with:
|
with:
|
||||||
node-version: 23
|
node-version: 24
|
||||||
pnpm-version: 9
|
pnpm-version: 10
|
||||||
- name: build
|
- name: build
|
||||||
run: pnpm build
|
run: pnpm build
|
||||||
- name: test
|
- name: test
|
||||||
@@ -28,6 +28,8 @@ jobs:
|
|||||||
- name: 'check for uncommitted changes'
|
- name: 'check for uncommitted changes'
|
||||||
# Ensure no changes
|
# Ensure no changes
|
||||||
run: |
|
run: |
|
||||||
|
pnpm --version
|
||||||
|
node --version
|
||||||
git add .
|
git add .
|
||||||
if ! git diff --cached --color=always --exit-code -- . ':!node_modules'; then
|
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."
|
echo "::error::Found changed files after build. Please run 'pnpm release' and check in all changes."
|
||||||
|
|||||||
@@ -17,21 +17,41 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v6
|
||||||
- uses: xmake-io/github-action-setup-xmake@master
|
- uses: xmake-io/github-action-setup-xmake@master
|
||||||
with:
|
with:
|
||||||
xmake-version: ${{ matrix.version }}
|
xmake-version: ${{ matrix.version }}
|
||||||
actions-cache-folder: '.xmake-cache'
|
actions-cache-folder: '.xmake-cache'
|
||||||
actions-cache-key: ${{ matrix.version }}
|
actions-cache-key: ${{ matrix.version }}-relative
|
||||||
build-cache: true
|
build-cache: true
|
||||||
build-cache-key: ${{ matrix.version }}
|
build-cache-key: ${{ matrix.version }}-relative
|
||||||
package-cache: true
|
package-cache: true
|
||||||
package-cache-key: ${{ matrix.version }}
|
package-cache-key: ${{ matrix.version }}-relative
|
||||||
project-path: 'tests/sample'
|
project-path: 'tests/sample'
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests with relative cache path
|
||||||
run: |
|
run: |
|
||||||
xmake --version
|
xmake --version
|
||||||
cd tests/sample
|
cd tests/sample
|
||||||
xmake -y -vD
|
xmake -y -vD
|
||||||
xmake run
|
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
|
git checkout test
|
||||||
pnpm build
|
pnpm build
|
||||||
pnpm release
|
pnpm release
|
||||||
git-commit -a -m "..."
|
git commit -a -m "..."
|
||||||
git push origin test
|
git push origin test
|
||||||
```
|
```
|
||||||
|
|||||||
+1
-1
@@ -36,6 +36,6 @@ inputs:
|
|||||||
default: ''
|
default: ''
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: 'node20'
|
using: 'node24'
|
||||||
main: 'dist/index.js'
|
main: 'dist/index.js'
|
||||||
post: 'dist/index.js'
|
post: 'dist/index.js'
|
||||||
|
|||||||
Vendored
+73
-42
@@ -70713,6 +70713,7 @@ const exec_1 = __nccwpck_require__(5236);
|
|||||||
const io = __nccwpck_require__(4994);
|
const io = __nccwpck_require__(4994);
|
||||||
const os = __nccwpck_require__(857);
|
const os = __nccwpck_require__(857);
|
||||||
const path = __nccwpck_require__(6928);
|
const path = __nccwpck_require__(6928);
|
||||||
|
const semver_1 = __nccwpck_require__(2088);
|
||||||
function makeOpt(ref) {
|
function makeOpt(ref) {
|
||||||
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
|
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
|
||||||
}
|
}
|
||||||
@@ -70727,25 +70728,38 @@ async function lsRemote(repo) {
|
|||||||
});
|
});
|
||||||
const data = { heads: {}, tags: {}, pull: {} };
|
const data = { heads: {}, tags: {}, pull: {} };
|
||||||
out.split('\n').forEach((line) => {
|
out.split('\n').forEach((line) => {
|
||||||
const [ref, tag] = line.trim().split('\t');
|
const [ref, path] = line.trim().split('\t');
|
||||||
if (ref && (tag === null || tag === void 0 ? void 0 : tag.startsWith('refs/'))) {
|
if (ref && (path === null || path === void 0 ? void 0 : path.startsWith('refs/'))) {
|
||||||
const tagPath = tag.split('/').splice(1);
|
const tagPath = path.split('/').splice(1);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
switch (tagPath[0]) {
|
||||||
let ldata = data; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
|
case 'heads': {
|
||||||
for (let i = 0; i < tagPath.length - 1; i++) {
|
// refs/heads/copilot/fix-6807
|
||||||
const seg = tagPath[i];
|
const head = tagPath.slice(1).join('/');
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
data.heads[head] = ref;
|
||||||
if (typeof ldata[seg] === 'object') {
|
break;
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
||||||
ldata = ldata[seg]; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
|
|
||||||
}
|
}
|
||||||
else {
|
case 'pull': {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
// refs/pull/11/head
|
||||||
ldata = ldata[seg] = {};
|
// refs/pull/11/merge
|
||||||
|
const pr = Number(tagPath[1]);
|
||||||
|
if (!data.pull[pr]) {
|
||||||
|
data.pull[pr] = {};
|
||||||
}
|
}
|
||||||
|
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;
|
return data;
|
||||||
@@ -70784,8 +70798,7 @@ const unix_install_1 = __nccwpck_require__(9095);
|
|||||||
async function installXmake() {
|
async function installXmake() {
|
||||||
const version = await (0, versions_1.selectVersion)();
|
const version = await (0, versions_1.selectVersion)();
|
||||||
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
||||||
const latest = await (0, versions_1.selectVersion)('latest');
|
await (0, win_install_1.winInstall)(version);
|
||||||
await (0, win_install_1.winInstall)(version, latest);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
await (0, unix_install_1.unixInstall)(version);
|
await (0, unix_install_1.unixInstall)(version);
|
||||||
@@ -71056,7 +71069,7 @@ async function unixInstall(version) {
|
|||||||
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
const platformIdentifier = await (0, system_1.getPlatformIdentifier)();
|
||||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
||||||
@@ -71083,7 +71096,7 @@ async function unixInstall(version) {
|
|||||||
await install(sourceDir, binDir);
|
await install(sourceDir, binDir);
|
||||||
let cacheDir = '';
|
let cacheDir = '';
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
await io.cp(binDir, cacheDir, {
|
await io.cp(binDir, cacheDir, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
});
|
});
|
||||||
@@ -71226,9 +71239,9 @@ async function selectSha(repo, sha) {
|
|||||||
return selectPr(repo, Number.parseInt(pr));
|
return selectPr(repo, Number.parseInt(pr));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Promise.resolve(new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`));
|
return Promise.resolve(new GitVersionImpl(repo, `sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substring(0, 8)}`));
|
||||||
}
|
}
|
||||||
async function selectVersion(version) {
|
async function selectVersion(version, _fallback = false) {
|
||||||
// get version string
|
// get version string
|
||||||
version = (version !== null && version !== void 0 ? version : core.getInput('xmake-version')) || 'latest';
|
version = (version !== null && version !== void 0 ? version : core.getInput('xmake-version')) || 'latest';
|
||||||
if (version.toLowerCase() === 'latest')
|
if (version.toLowerCase() === 'latest')
|
||||||
@@ -71249,20 +71262,20 @@ async function selectVersion(version) {
|
|||||||
}
|
}
|
||||||
// select branch
|
// select branch
|
||||||
if (version.startsWith('branch@')) {
|
if (version.startsWith('branch@')) {
|
||||||
const branch = version.substr('branch@'.length);
|
const branch = version.substring('branch@'.length);
|
||||||
ret = await selectBranch(repo, branch);
|
ret = await selectBranch(repo, branch);
|
||||||
}
|
}
|
||||||
// select pr
|
// select pr
|
||||||
if (version.startsWith('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) {
|
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);
|
ret = await selectPr(repo, pr);
|
||||||
}
|
}
|
||||||
// select sha
|
// select sha
|
||||||
if (version.startsWith('sha@')) {
|
if (version.startsWith('sha@')) {
|
||||||
const sha = version.substr('sha@'.length);
|
const sha = version.substring('sha@'.length);
|
||||||
ret = await selectSha(repo, sha);
|
ret = await selectSha(repo, sha);
|
||||||
}
|
}
|
||||||
// select version
|
// select version
|
||||||
@@ -71275,8 +71288,8 @@ async function selectVersion(version) {
|
|||||||
if (ret.type === 'local') {
|
if (ret.type === 'local') {
|
||||||
core.info(`Use local xmake at '${ret.path}'`);
|
core.info(`Use local xmake at '${ret.path}'`);
|
||||||
}
|
}
|
||||||
else {
|
else if (!_fallback) {
|
||||||
core.info(`Selected xmake ${String(ret)} (commit: ${ret.sha.substr(0, 8)})` +
|
core.info(`Selected xmake ${String(ret)} (commit: ${ret.sha.substring(0, 8)})` +
|
||||||
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''));
|
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''));
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
@@ -71302,17 +71315,21 @@ const fs = __nccwpck_require__(9896);
|
|||||||
const path = __nccwpck_require__(6928);
|
const path = __nccwpck_require__(6928);
|
||||||
const semver = __nccwpck_require__(2088);
|
const semver = __nccwpck_require__(2088);
|
||||||
const git = __nccwpck_require__(1243);
|
const git = __nccwpck_require__(1243);
|
||||||
|
const versions_1 = __nccwpck_require__(7902);
|
||||||
const system_1 = __nccwpck_require__(7666);
|
const system_1 = __nccwpck_require__(7666);
|
||||||
function getInstallerUrl(version, latest) {
|
async function getInstallerUrl(version, _fallback = false) {
|
||||||
let ver = version.version;
|
const latest = (await (0, versions_1.selectVersion)('latest', _fallback));
|
||||||
|
const latestVers = latest.version;
|
||||||
|
let vers = version.version;
|
||||||
|
let finalUrl;
|
||||||
switch (version.type) {
|
switch (version.type) {
|
||||||
case 'heads': {
|
case 'heads': {
|
||||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||||
const latestver = latest.version;
|
if (vers !== 'dev' && vers !== 'master') {
|
||||||
if (ver !== 'dev' && ver !== 'master') {
|
vers = latestVers;
|
||||||
ver = latestver;
|
|
||||||
}
|
}
|
||||||
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': {
|
case 'pull': {
|
||||||
throw new Error('PR builds for windows is not supported');
|
throw new Error('PR builds for windows is not supported');
|
||||||
@@ -71322,9 +71339,10 @@ function getInstallerUrl(version, latest) {
|
|||||||
}
|
}
|
||||||
case 'tags': {
|
case 'tags': {
|
||||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||||
return semver.gt(ver, '2.2.6')
|
finalUrl = semver.gt(vers, '2.2.6')
|
||||||
? `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.${arch}.exe`
|
? `https://github.com/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.${arch}.exe`
|
||||||
: `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`;
|
: `https://github.com/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.exe`;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
// check that we have tested all types
|
// check that we have tested all types
|
||||||
@@ -71332,13 +71350,26 @@ function getInstallerUrl(version, latest) {
|
|||||||
throw new Error('Unknown version type');
|
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) {
|
async function installFromSource(xmakeBin, sourceDir, binDir) {
|
||||||
await (0, exec_1.exec)(xmakeBin, ['-y'], { cwd: sourceDir });
|
await (0, exec_1.exec)(xmakeBin, ['-y'], { cwd: sourceDir });
|
||||||
await (0, exec_1.exec)(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
|
await (0, exec_1.exec)(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
|
||||||
}
|
}
|
||||||
async function winInstall(version, latest) {
|
async function winInstall(version) {
|
||||||
if (version.type === 'local' || latest.type === 'local') {
|
if (version.type === 'local') {
|
||||||
throw new Error('Local builds for windows is not supported');
|
throw new Error('Local builds for windows is not supported');
|
||||||
}
|
}
|
||||||
const actionsCacheFolder = core.getInput('actions-cache-folder');
|
const actionsCacheFolder = core.getInput('actions-cache-folder');
|
||||||
@@ -71352,7 +71383,7 @@ async function winInstall(version, latest) {
|
|||||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||||
let toolDir = '';
|
let toolDir = '';
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||||
@@ -71374,7 +71405,7 @@ async function winInstall(version, latest) {
|
|||||||
}
|
}
|
||||||
if (!toolDir) {
|
if (!toolDir) {
|
||||||
const installer = await core.group(`download xmake ${String(version)}`, async () => {
|
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}`);
|
core.info(`downloading from ${url}`);
|
||||||
const file = await toolCache.downloadTool(url);
|
const file = await toolCache.downloadTool(url);
|
||||||
const exe = path.format({
|
const exe = path.format({
|
||||||
@@ -71411,7 +71442,7 @@ async function winInstall(version, latest) {
|
|||||||
if (toolDir) {
|
if (toolDir) {
|
||||||
let cacheDir = '';
|
let cacheDir = '';
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
await io.cp(toolDir, cacheDir, {
|
await io.cp(toolDir, cacheDir, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
});
|
});
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "github-action-setup-xmake",
|
"name": "github-action-setup-xmake",
|
||||||
"version": "1.2.1",
|
"version": "1.2.5",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "github-action-setup-xmake",
|
"name": "github-action-setup-xmake",
|
||||||
"version": "1.2.1",
|
"version": "1.2.5",
|
||||||
"license": "GPL-3.0-or-later",
|
"license": "GPL-3.0-or-later",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/cache": "^4.0.3",
|
"@actions/cache": "^4.0.3",
|
||||||
|
|||||||
+9
-9
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "github-action-setup-xmake",
|
"name": "github-action-setup-xmake",
|
||||||
"version": "1.2.1",
|
"version": "1.2.5",
|
||||||
"description": "Set up your GitHub Actions workflow with a specific version of xmake",
|
"description": "Set up your GitHub Actions workflow with a specific version of xmake",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"author": "OpportunityLiu",
|
"author": "OpportunityLiu",
|
||||||
"license": "GPL-3.0-or-later",
|
"license": "GPL-3.0-or-later",
|
||||||
"repository": "https://github.com/xmake-io/github-action-setup-xmake.git",
|
"repository": "https://git.soulmc.cn/wed15/github-action-setup-xmake.git",
|
||||||
"homepage": "https://github.com/xmake-io/github-action-setup-xmake",
|
"homepage": "https://git.soulmc.cn/wed15/github-action-setup-xmake",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"watch": "tsc --watch",
|
"watch": "tsc --watch",
|
||||||
"build": "ncc build src/index.ts",
|
"build": "ncc build src/index.ts",
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
"release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
|
"release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/cache": "^4.0.3",
|
"@actions/cache": "^5.0.5",
|
||||||
"@actions/core": "^1.11.1",
|
"@actions/core": "^2.0.3",
|
||||||
"@actions/exec": "^1.1.1",
|
"@actions/exec": "^2.0.0",
|
||||||
"@actions/io": "^1.1.3",
|
"@actions/io": "^2.0.0",
|
||||||
"@actions/tool-cache": "^2.0.2",
|
"@actions/tool-cache": "^3.0.1",
|
||||||
"semver": "^7.7.2"
|
"semver": "^7.7.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^29.5.12",
|
"@types/jest": "^29.5.12",
|
||||||
|
|||||||
Generated
+294
-385
File diff suppressed because it is too large
Load Diff
+31
-16
@@ -3,6 +3,7 @@ import * as io from '@actions/io';
|
|||||||
import * as os from 'os';
|
import * as os from 'os';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
import { Sha, RefDic, Repo } from './interfaces';
|
import { Sha, RefDic, Repo } from './interfaces';
|
||||||
|
import { valid as isValidSemver } from 'semver';
|
||||||
|
|
||||||
function makeOpt(ref: Sha): { cwd: string } {
|
function makeOpt(ref: Sha): { cwd: string } {
|
||||||
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
|
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: {} };
|
const data: RefDic = { heads: {}, tags: {}, pull: {} };
|
||||||
out.split('\n').forEach((line) => {
|
out.split('\n').forEach((line) => {
|
||||||
const [ref, tag] = line.trim().split('\t');
|
const [ref, path] = line.trim().split('\t') as [Sha, string];
|
||||||
if (ref && tag?.startsWith('refs/')) {
|
if (ref && path?.startsWith('refs/')) {
|
||||||
const tagPath = tag.split('/').splice(1);
|
const tagPath = path.split('/').splice(1);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
switch (tagPath[0]) {
|
||||||
let ldata = data as any; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
|
case 'heads': {
|
||||||
for (let i = 0; i < tagPath.length - 1; i++) {
|
// refs/heads/copilot/fix-6807
|
||||||
const seg = tagPath[i];
|
const head = tagPath.slice(1).join('/');
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
data.heads[head] = ref;
|
||||||
if (typeof ldata[seg] === 'object') {
|
break;
|
||||||
// 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;
|
return data;
|
||||||
|
|||||||
+1
-2
@@ -7,8 +7,7 @@ import { unixInstall } from './unix-install';
|
|||||||
export async function installXmake(): Promise<void> {
|
export async function installXmake(): Promise<void> {
|
||||||
const version = await selectVersion();
|
const version = await selectVersion();
|
||||||
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
|
||||||
const latest = await selectVersion('latest');
|
await winInstall(version);
|
||||||
await winInstall(version, latest);
|
|
||||||
} else {
|
} else {
|
||||||
await unixInstall(version);
|
await unixInstall(version);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -37,7 +37,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
|||||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||||
|
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
||||||
@@ -65,7 +65,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
|||||||
let cacheDir = '';
|
let cacheDir = '';
|
||||||
|
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
await io.cp(binDir, cacheDir, {
|
await io.cp(binDir, cacheDir, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
});
|
});
|
||||||
|
|||||||
+8
-8
@@ -96,11 +96,11 @@ async function selectSha(repo: Repo, sha: string): Promise<Version> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Promise.resolve(
|
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
|
// get version string
|
||||||
version = (version ?? core.getInput('xmake-version')) || 'latest';
|
version = (version ?? core.getInput('xmake-version')) || 'latest';
|
||||||
if (version.toLowerCase() === 'latest') version = '';
|
if (version.toLowerCase() === 'latest') version = '';
|
||||||
@@ -123,20 +123,20 @@ export async function selectVersion(version?: string): Promise<Version> {
|
|||||||
|
|
||||||
// select branch
|
// select branch
|
||||||
if (version.startsWith('branch@')) {
|
if (version.startsWith('branch@')) {
|
||||||
const branch = version.substr('branch@'.length);
|
const branch = version.substring('branch@'.length);
|
||||||
ret = await selectBranch(repo, branch);
|
ret = await selectBranch(repo, branch);
|
||||||
}
|
}
|
||||||
// select pr
|
// select pr
|
||||||
if (version.startsWith('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) {
|
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);
|
ret = await selectPr(repo, pr);
|
||||||
}
|
}
|
||||||
// select sha
|
// select sha
|
||||||
if (version.startsWith('sha@')) {
|
if (version.startsWith('sha@')) {
|
||||||
const sha = version.substr('sha@'.length);
|
const sha = version.substring('sha@'.length);
|
||||||
ret = await selectSha(repo, sha);
|
ret = await selectSha(repo, sha);
|
||||||
}
|
}
|
||||||
// select version
|
// select version
|
||||||
@@ -148,9 +148,9 @@ export async function selectVersion(version?: string): Promise<Version> {
|
|||||||
}
|
}
|
||||||
if (ret.type === 'local') {
|
if (ret.type === 'local') {
|
||||||
core.info(`Use local xmake at '${ret.path}'`);
|
core.info(`Use local xmake at '${ret.path}'`);
|
||||||
} else {
|
} else if (!_fallback) {
|
||||||
core.info(
|
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}` : ''),
|
(repo !== DEFAULT_REPO ? ` of ${repo}` : ''),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
+34
-14
@@ -9,18 +9,22 @@ import * as path from 'path';
|
|||||||
import * as semver from 'semver';
|
import * as semver from 'semver';
|
||||||
import * as git from './git';
|
import * as git from './git';
|
||||||
import { Version, GitVersion } from './interfaces';
|
import { Version, GitVersion } from './interfaces';
|
||||||
|
import { selectVersion } from './versions';
|
||||||
import { getPlatformIdentifier } from './system';
|
import { getPlatformIdentifier } from './system';
|
||||||
|
|
||||||
function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
|
async function getInstallerUrl(version: GitVersion, _fallback: boolean = false): Promise<string> {
|
||||||
let ver = version.version;
|
const latest = (await selectVersion('latest', _fallback)) as GitVersion;
|
||||||
|
const latestVers = latest.version;
|
||||||
|
let vers = version.version;
|
||||||
|
let finalUrl: string;
|
||||||
switch (version.type) {
|
switch (version.type) {
|
||||||
case 'heads': {
|
case 'heads': {
|
||||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||||
const latestver = latest.version;
|
if (vers !== 'dev' && vers !== 'master') {
|
||||||
if (ver !== 'dev' && ver !== 'master') {
|
vers = latestVers;
|
||||||
ver = latestver;
|
|
||||||
}
|
}
|
||||||
return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`;
|
finalUrl = `https://github.bibk.top/xmake-io/xmake/releases/download/${latestVers}/xmake-${vers}.${arch}.exe`;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case 'pull': {
|
case 'pull': {
|
||||||
throw new Error('PR builds for windows is not supported');
|
throw new Error('PR builds for windows is not supported');
|
||||||
@@ -30,9 +34,10 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
|
|||||||
}
|
}
|
||||||
case 'tags': {
|
case 'tags': {
|
||||||
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
|
||||||
return semver.gt(ver, '2.2.6')
|
finalUrl = semver.gt(vers, '2.2.6')
|
||||||
? `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.${arch}.exe`
|
? `https://github.bibk.top/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.${arch}.exe`
|
||||||
: `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`;
|
: `https://github.bibk.top/xmake-io/xmake/releases/download/${vers}/xmake-${vers}.exe`;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
// check that we have tested all types
|
// check that we have tested all types
|
||||||
@@ -40,6 +45,21 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
|
|||||||
throw new Error('Unknown version type');
|
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> {
|
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 });
|
await exec(xmakeBin, ['install', '-o', binDir, 'cli'], { cwd: sourceDir });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function winInstall(version: Version, latest: Version): Promise<void> {
|
export async function winInstall(version: Version): Promise<void> {
|
||||||
if (version.type === 'local' || latest.type === 'local') {
|
if (version.type === 'local') {
|
||||||
throw new Error('Local builds for windows is not supported');
|
throw new Error('Local builds for windows is not supported');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +85,7 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
|
|||||||
|
|
||||||
let toolDir = '';
|
let toolDir = '';
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
try {
|
try {
|
||||||
try {
|
try {
|
||||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||||
@@ -85,7 +105,7 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
|
|||||||
|
|
||||||
if (!toolDir) {
|
if (!toolDir) {
|
||||||
const installer = await core.group(`download xmake ${String(version)}`, async () => {
|
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}`);
|
core.info(`downloading from ${url}`);
|
||||||
const file = await toolCache.downloadTool(url);
|
const file = await toolCache.downloadTool(url);
|
||||||
const exe = path.format({
|
const exe = path.format({
|
||||||
@@ -126,7 +146,7 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
|
|||||||
if (toolDir) {
|
if (toolDir) {
|
||||||
let cacheDir = '';
|
let cacheDir = '';
|
||||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||||
await io.cp(toolDir, cacheDir, {
|
await io.cp(toolDir, cacheDir, {
|
||||||
recursive: true,
|
recursive: true,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user