Compare commits

..

12 Commits

8 changed files with 227 additions and 50 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macOS-latest] os: [ubuntu-latest, windows-latest, windows-11-arm, macOS-latest]
version: [latest, branch@master, branch@dev] version: [latest, branch@master, branch@dev]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
+26 -3
View File
@@ -82512,6 +82512,10 @@ async function getBuildCachePath() {
const projectRootPath = getProjectRootPath(); const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options = {}; const options = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath; options.cwd = projectRootPath;
options.listeners = { options.listeners = {
stdout: (data) => { stdout: (data) => {
@@ -82599,7 +82603,12 @@ async function saveBuildCache() {
await io.cp(buildCachePath, fullCachePath, { await io.cp(buildCachePath, fullCachePath, {
recursive: true, recursive: true,
}); });
await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')]); const options = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')], options);
await cache.saveCache([buildCacheFolder], buildCacheKey); await cache.saveCache([buildCacheFolder], buildCacheKey);
} }
} }
@@ -82801,6 +82810,10 @@ async function getPackageCacheKey() {
const projectRootPath = getProjectRootPath(); const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options = {}; const options = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath; options.cwd = projectRootPath;
options.listeners = { options.listeners = {
stdout: (data) => { stdout: (data) => {
@@ -82816,6 +82829,10 @@ async function getPackageCacheKey() {
async function getPackageCachePath() { async function getPackageCachePath() {
let packageCachePath = ''; let packageCachePath = '';
const options = {}; const options = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.listeners = { options.listeners = {
stdout: (data) => { stdout: (data) => {
packageCachePath += data.toString(); packageCachePath += data.toString();
@@ -82880,6 +82897,12 @@ async function savePackageCache() {
await io.cp(packageCachePath, fullCachePath, { await io.cp(packageCachePath, fullCachePath, {
recursive: true, recursive: true,
}); });
const options = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
await (0, exec_1.exec)('xmake', ['l', 'os.touch', path.join(fullCachePath, 'package_cache_saved.txt')], options);
await cache.saveCache([packageCacheFolder], packageCacheKey); await cache.saveCache([packageCacheFolder], packageCacheKey);
} }
} }
@@ -83202,7 +83225,7 @@ function getInstallerUrl(version, latest) {
let ver = version.version; let ver = version.version;
switch (version.type) { switch (version.type) {
case 'heads': { case 'heads': {
const arch = os.arch() === 'x64' ? 'win64' : 'win32'; const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
const latestver = latest.version; const latestver = latest.version;
if (ver !== 'dev' && ver !== 'master') { if (ver !== 'dev' && ver !== 'master') {
ver = latestver; ver = latestver;
@@ -83216,7 +83239,7 @@ function getInstallerUrl(version, latest) {
throw new Error('Sha builds for windows is not supported'); throw new Error('Sha builds for windows is not supported');
} }
case 'tags': { case 'tags': {
const arch = os.arch() === 'x64' ? 'win64' : 'win32'; const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
return semver.gt(ver, '2.2.6') 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}.${arch}.exe`
: `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`; : `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`;
+84 -23
View File
@@ -1,20 +1,19 @@
{ {
"name": "github-action-setup-xmake", "name": "github-action-setup-xmake",
"version": "1.1.5", "version": "1.1.9",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "github-action-setup-xmake", "name": "github-action-setup-xmake",
"version": "1.1.5", "version": "1.1.9",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@actions/cache": "^3.2.4", "@actions/cache": "^4.0.3",
"@actions/core": "^1.10.1", "@actions/core": "^1.10.1",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1",
"@actions/io": "^1.1.3", "@actions/io": "^1.1.3",
"@actions/tool-cache": "^2.0.1", "@actions/tool-cache": "^2.0.1",
"pnpm": "^9.15.0",
"semver": "^7.6.0" "semver": "^7.6.0"
}, },
"devDependencies": { "devDependencies": {
@@ -36,9 +35,9 @@
} }
}, },
"node_modules/@actions/cache": { "node_modules/@actions/cache": {
"version": "3.3.0", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.3.0.tgz", "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-4.0.3.tgz",
"integrity": "sha512-+eCsMTIZUEm+QA9GqjollOhCdvRrZ1JV8d9Rp34zVNizBkYITO8dhKczP5Xps1dFzc5n59p7vYVtZrGt18bb5Q==", "integrity": "sha512-SvrqFtYJ7I48A/uXNkoJrnukx5weQv1fGquhs3+4nkByZThBH109KTIqj5x/cGV7JGNvb8dLPVywUOqX1fjiXg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@actions/core": "^1.11.1", "@actions/core": "^1.11.1",
@@ -49,6 +48,7 @@
"@azure/abort-controller": "^1.1.0", "@azure/abort-controller": "^1.1.0",
"@azure/ms-rest-js": "^2.6.0", "@azure/ms-rest-js": "^2.6.0",
"@azure/storage-blob": "^12.13.0", "@azure/storage-blob": "^12.13.0",
"@protobuf-ts/plugin": "^2.9.4",
"semver": "^6.3.1" "semver": "^6.3.1"
} }
}, },
@@ -1709,6 +1709,83 @@
"url": "https://opencollective.com/unts" "url": "https://opencollective.com/unts"
} }
}, },
"node_modules/@protobuf-ts/plugin": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.10.0.tgz",
"integrity": "sha512-iMX4C4TVfMNRLn2msK0cVg5jmizjtu5FYiy8EK5Lg6EgyR9TVHeK2rzmufWKYM2Pcg1jSwC0cFcXHQnCoeFxUg==",
"license": "Apache-2.0",
"dependencies": {
"@protobuf-ts/plugin-framework": "^2.10.0",
"@protobuf-ts/protoc": "^2.10.0",
"@protobuf-ts/runtime": "^2.10.0",
"@protobuf-ts/runtime-rpc": "^2.10.0",
"typescript": "^3.9"
},
"bin": {
"protoc-gen-dump": "bin/protoc-gen-dump",
"protoc-gen-ts": "bin/protoc-gen-ts"
}
},
"node_modules/@protobuf-ts/plugin-framework": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.10.0.tgz",
"integrity": "sha512-EuW9irbt+w7Ml1CaAxK6xyl7pSuWVbNy0rsChxJEthMrAVTN5EPdJ3whNWvsRBa+HwRImEl8KHNnRoq/vGOHbg==",
"license": "(Apache-2.0 AND BSD-3-Clause)",
"dependencies": {
"@protobuf-ts/runtime": "^2.10.0",
"typescript": "^3.9"
}
},
"node_modules/@protobuf-ts/plugin-framework/node_modules/typescript": {
"version": "3.9.10",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
"integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=4.2.0"
}
},
"node_modules/@protobuf-ts/plugin/node_modules/typescript": {
"version": "3.9.10",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
"integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=4.2.0"
}
},
"node_modules/@protobuf-ts/protoc": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.10.0.tgz",
"integrity": "sha512-S4BtGBh22+uL5E6qLVxV0QNY6tiLVB8QL7RIkvo+KYknipZfSNwubdKy5CPkrwVXzJn4s3cx7bKx1w6BxkBIPg==",
"license": "Apache-2.0",
"bin": {
"protoc": "protoc.js"
}
},
"node_modules/@protobuf-ts/runtime": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.10.0.tgz",
"integrity": "sha512-ypYwGg9Pn3W/2lZ7/HW60hONGuSdzphvOY8Dq7LeNttymDe0y3LaTUUMRpuGqOT6FfrWEMnfQbyqU8AAreo8wA==",
"license": "(Apache-2.0 AND BSD-3-Clause)"
},
"node_modules/@protobuf-ts/runtime-rpc": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.10.0.tgz",
"integrity": "sha512-8CS/XPv3+pMK4v8UKhtCdvbS4h9l7aqlteKdRt0/UbIKZ8n0qHj6hX8cBhz2ngvohxCOS0N08zPr9aCLBNhW3Q==",
"license": "Apache-2.0",
"dependencies": {
"@protobuf-ts/runtime": "^2.10.0"
}
},
"node_modules/@sinclair/typebox": { "node_modules/@sinclair/typebox": {
"version": "0.27.8", "version": "0.27.8",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -5094,22 +5171,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/pnpm": {
"version": "9.15.0",
"resolved": "https://registry.npmjs.org/pnpm/-/pnpm-9.15.0.tgz",
"integrity": "sha512-duI3l2CkMo7EQVgVvNZije5yevN3mqpMkU45RBVsQpmSGon5djge4QfUHxLPpLZmgcqccY8GaPoIMe1MbYulbA==",
"license": "MIT",
"bin": {
"pnpm": "bin/pnpm.cjs",
"pnpx": "bin/pnpx.cjs"
},
"engines": {
"node": ">=18.12"
},
"funding": {
"url": "https://opencollective.com/pnpm"
}
},
"node_modules/prelude-ls": { "node_modules/prelude-ls": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "github-action-setup-xmake", "name": "github-action-setup-xmake",
"version": "1.1.5", "version": "1.1.9",
"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",
@@ -18,7 +18,7 @@
"release": "pnpm clean && pnpm format && pnpm lint && pnpm build" "release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
}, },
"dependencies": { "dependencies": {
"@actions/cache": "^3.2.4", "@actions/cache": "^4.0.3",
"@actions/core": "^1.10.1", "@actions/core": "^1.10.1",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1",
"@actions/io": "^1.1.3", "@actions/io": "^1.1.3",
+88 -18
View File
@@ -8,8 +8,8 @@ importers:
.: .:
dependencies: dependencies:
'@actions/cache': '@actions/cache':
specifier: ^3.2.4 specifier: ^4.0.3
version: 3.2.4 version: 4.0.3
'@actions/core': '@actions/core':
specifier: ^1.10.1 specifier: ^1.10.1
version: 1.10.1 version: 1.10.1
@@ -37,7 +37,7 @@ importers:
version: 7.5.8 version: 7.5.8
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: ^7.5.0 specifier: ^7.5.0
version: 7.5.0(@typescript-eslint/parser@7.5.0)(eslint@8.57.0)(typescript@5.4.4) version: 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.4))(eslint@8.57.0)(typescript@5.4.4)
'@typescript-eslint/parser': '@typescript-eslint/parser':
specifier: ^7.5.0 specifier: ^7.5.0
version: 7.5.0(eslint@8.57.0)(typescript@5.4.4) version: 7.5.0(eslint@8.57.0)(typescript@5.4.4)
@@ -52,7 +52,7 @@ importers:
version: 9.1.0(eslint@8.57.0) version: 9.1.0(eslint@8.57.0)
eslint-plugin-prettier: eslint-plugin-prettier:
specifier: ^5.1.3 specifier: ^5.1.3
version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5)
jest: jest:
specifier: ^29.7.0 specifier: ^29.7.0
version: 29.7.0(@types/node@20.12.4) version: 29.7.0(@types/node@20.12.4)
@@ -64,7 +64,7 @@ importers:
version: 5.0.5 version: 5.0.5
ts-jest: ts-jest:
specifier: ^29.1.2 specifier: ^29.1.2
version: 29.1.2(@babel/core@7.24.4)(jest@29.7.0)(typescript@5.4.4) version: 29.1.2(@babel/core@7.24.4)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.4))(jest@29.7.0(@types/node@20.12.4))(typescript@5.4.4)
type-fest: type-fest:
specifier: ^4.15.0 specifier: ^4.15.0
version: 4.15.0 version: 4.15.0
@@ -78,14 +78,18 @@ packages:
{ integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== } { integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== }
engines: { node: '>=0.10.0' } engines: { node: '>=0.10.0' }
'@actions/cache@3.2.4': '@actions/cache@4.0.3':
resolution: resolution:
{ integrity: sha512-RuHnwfcDagtX+37s0ZWy7clbOfnZ7AlDJQ7k/9rzt2W4Gnwde3fa/qjSjVuz4vLcLIpc7fUob27CMrqiWZytYA== } { integrity: sha512-SvrqFtYJ7I48A/uXNkoJrnukx5weQv1fGquhs3+4nkByZThBH109KTIqj5x/cGV7JGNvb8dLPVywUOqX1fjiXg== }
'@actions/core@1.10.1': '@actions/core@1.10.1':
resolution: resolution:
{ integrity: sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g== } { integrity: sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g== }
'@actions/core@1.11.1':
resolution:
{ integrity: sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A== }
'@actions/exec@1.1.1': '@actions/exec@1.1.1':
resolution: resolution:
{ integrity: sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w== } { integrity: sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w== }
@@ -130,6 +134,7 @@ packages:
resolution: resolution:
{ integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ== } { integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ== }
engines: { node: '>=14.0.0' } engines: { node: '>=14.0.0' }
deprecated: This package is no longer supported. Please migrate to use @azure/core-rest-pipeline
'@azure/core-lro@2.7.1': '@azure/core-lro@2.7.1':
resolution: resolution:
@@ -558,6 +563,28 @@ packages:
{ integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== } { integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== }
engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 } engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 }
'@protobuf-ts/plugin-framework@2.10.0':
resolution:
{ integrity: sha512-EuW9irbt+w7Ml1CaAxK6xyl7pSuWVbNy0rsChxJEthMrAVTN5EPdJ3whNWvsRBa+HwRImEl8KHNnRoq/vGOHbg== }
'@protobuf-ts/plugin@2.10.0':
resolution:
{ integrity: sha512-iMX4C4TVfMNRLn2msK0cVg5jmizjtu5FYiy8EK5Lg6EgyR9TVHeK2rzmufWKYM2Pcg1jSwC0cFcXHQnCoeFxUg== }
hasBin: true
'@protobuf-ts/protoc@2.10.0':
resolution:
{ integrity: sha512-S4BtGBh22+uL5E6qLVxV0QNY6tiLVB8QL7RIkvo+KYknipZfSNwubdKy5CPkrwVXzJn4s3cx7bKx1w6BxkBIPg== }
hasBin: true
'@protobuf-ts/runtime-rpc@2.10.0':
resolution:
{ integrity: sha512-8CS/XPv3+pMK4v8UKhtCdvbS4h9l7aqlteKdRt0/UbIKZ8n0qHj6hX8cBhz2ngvohxCOS0N08zPr9aCLBNhW3Q== }
'@protobuf-ts/runtime@2.10.0':
resolution:
{ integrity: sha512-ypYwGg9Pn3W/2lZ7/HW60hONGuSdzphvOY8Dq7LeNttymDe0y3LaTUUMRpuGqOT6FfrWEMnfQbyqU8AAreo8wA== }
'@sinclair/typebox@0.27.8': '@sinclair/typebox@0.27.8':
resolution: resolution:
{ integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== } { integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== }
@@ -2196,6 +2223,12 @@ packages:
{ integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA== } { integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA== }
engines: { node: '>=16' } engines: { node: '>=16' }
typescript@3.9.10:
resolution:
{ integrity: sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== }
engines: { node: '>=4.2.0' }
hasBin: true
typescript@5.4.4: typescript@5.4.4:
resolution: resolution:
{ integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw== } { integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw== }
@@ -2316,9 +2349,9 @@ packages:
snapshots: snapshots:
'@aashutoshrathi/word-wrap@1.2.6': {} '@aashutoshrathi/word-wrap@1.2.6': {}
'@actions/cache@3.2.4': '@actions/cache@4.0.3':
dependencies: dependencies:
'@actions/core': 1.10.1 '@actions/core': 1.11.1
'@actions/exec': 1.1.1 '@actions/exec': 1.1.1
'@actions/glob': 0.1.2 '@actions/glob': 0.1.2
'@actions/http-client': 2.2.1 '@actions/http-client': 2.2.1
@@ -2326,8 +2359,8 @@ snapshots:
'@azure/abort-controller': 1.1.0 '@azure/abort-controller': 1.1.0
'@azure/ms-rest-js': 2.7.0 '@azure/ms-rest-js': 2.7.0
'@azure/storage-blob': 12.17.0 '@azure/storage-blob': 12.17.0
'@protobuf-ts/plugin': 2.10.0
semver: 6.3.1 semver: 6.3.1
uuid: 3.4.0
transitivePeerDependencies: transitivePeerDependencies:
- encoding - encoding
@@ -2336,13 +2369,18 @@ snapshots:
'@actions/http-client': 2.2.1 '@actions/http-client': 2.2.1
uuid: 8.3.2 uuid: 8.3.2
'@actions/core@1.11.1':
dependencies:
'@actions/exec': 1.1.1
'@actions/http-client': 2.2.1
'@actions/exec@1.1.1': '@actions/exec@1.1.1':
dependencies: dependencies:
'@actions/io': 1.1.3 '@actions/io': 1.1.3
'@actions/glob@0.1.2': '@actions/glob@0.1.2':
dependencies: dependencies:
'@actions/core': 1.10.1 '@actions/core': 1.11.1
minimatch: 3.1.2 minimatch: 3.1.2
'@actions/http-client@2.2.1': '@actions/http-client@2.2.1':
@@ -2904,6 +2942,27 @@ snapshots:
'@pkgr/core@0.1.1': {} '@pkgr/core@0.1.1': {}
'@protobuf-ts/plugin-framework@2.10.0':
dependencies:
'@protobuf-ts/runtime': 2.10.0
typescript: 3.9.10
'@protobuf-ts/plugin@2.10.0':
dependencies:
'@protobuf-ts/plugin-framework': 2.10.0
'@protobuf-ts/protoc': 2.10.0
'@protobuf-ts/runtime': 2.10.0
'@protobuf-ts/runtime-rpc': 2.10.0
typescript: 3.9.10
'@protobuf-ts/protoc@2.10.0': {}
'@protobuf-ts/runtime-rpc@2.10.0':
dependencies:
'@protobuf-ts/runtime': 2.10.0
'@protobuf-ts/runtime@2.10.0': {}
'@sinclair/typebox@0.27.8': {} '@sinclair/typebox@0.27.8': {}
'@sinonjs/commons@3.0.1': '@sinonjs/commons@3.0.1':
@@ -2979,7 +3038,7 @@ snapshots:
dependencies: dependencies:
'@types/yargs-parser': 21.0.3 '@types/yargs-parser': 21.0.3
'@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0)(eslint@8.57.0)(typescript@5.4.4)': '@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.57.0)(typescript@5.4.4))(eslint@8.57.0)(typescript@5.4.4)':
dependencies: dependencies:
'@eslint-community/regexpp': 4.10.0 '@eslint-community/regexpp': 4.10.0
'@typescript-eslint/parser': 7.5.0(eslint@8.57.0)(typescript@5.4.4) '@typescript-eslint/parser': 7.5.0(eslint@8.57.0)(typescript@5.4.4)
@@ -2994,6 +3053,7 @@ snapshots:
natural-compare: 1.4.0 natural-compare: 1.4.0
semver: 7.6.0 semver: 7.6.0
ts-api-utils: 1.3.0(typescript@5.4.4) ts-api-utils: 1.3.0(typescript@5.4.4)
optionalDependencies:
typescript: 5.4.4 typescript: 5.4.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -3006,6 +3066,7 @@ snapshots:
'@typescript-eslint/visitor-keys': 7.5.0 '@typescript-eslint/visitor-keys': 7.5.0
debug: 4.3.4 debug: 4.3.4
eslint: 8.57.0 eslint: 8.57.0
optionalDependencies:
typescript: 5.4.4 typescript: 5.4.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -3022,6 +3083,7 @@ snapshots:
debug: 4.3.4 debug: 4.3.4
eslint: 8.57.0 eslint: 8.57.0
ts-api-utils: 1.3.0(typescript@5.4.4) ts-api-utils: 1.3.0(typescript@5.4.4)
optionalDependencies:
typescript: 5.4.4 typescript: 5.4.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -3038,6 +3100,7 @@ snapshots:
minimatch: 9.0.3 minimatch: 9.0.3
semver: 7.6.0 semver: 7.6.0
ts-api-utils: 1.3.0(typescript@5.4.4) ts-api-utils: 1.3.0(typescript@5.4.4)
optionalDependencies:
typescript: 5.4.4 typescript: 5.4.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -3327,13 +3390,14 @@ snapshots:
dependencies: dependencies:
eslint: 8.57.0 eslint: 8.57.0
eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5): eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5):
dependencies: dependencies:
eslint: 8.57.0 eslint: 8.57.0
eslint-config-prettier: 9.1.0(eslint@8.57.0)
prettier: 3.2.5 prettier: 3.2.5
prettier-linter-helpers: 1.0.0 prettier-linter-helpers: 1.0.0
synckit: 0.8.8 synckit: 0.8.8
optionalDependencies:
eslint-config-prettier: 9.1.0(eslint@8.57.0)
eslint-scope@7.2.2: eslint-scope@7.2.2:
dependencies: dependencies:
@@ -3717,7 +3781,6 @@ snapshots:
'@babel/core': 7.24.4 '@babel/core': 7.24.4
'@jest/test-sequencer': 29.7.0 '@jest/test-sequencer': 29.7.0
'@jest/types': 29.6.3 '@jest/types': 29.6.3
'@types/node': 20.12.4
babel-jest: 29.7.0(@babel/core@7.24.4) babel-jest: 29.7.0(@babel/core@7.24.4)
chalk: 4.1.2 chalk: 4.1.2
ci-info: 3.9.0 ci-info: 3.9.0
@@ -3737,6 +3800,8 @@ snapshots:
pretty-format: 29.7.0 pretty-format: 29.7.0
slash: 3.0.0 slash: 3.0.0
strip-json-comments: 3.1.1 strip-json-comments: 3.1.1
optionalDependencies:
'@types/node': 20.12.4
transitivePeerDependencies: transitivePeerDependencies:
- babel-plugin-macros - babel-plugin-macros
- supports-color - supports-color
@@ -3818,7 +3883,7 @@ snapshots:
jest-util: 29.7.0 jest-util: 29.7.0
jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
dependencies: optionalDependencies:
jest-resolve: 29.7.0 jest-resolve: 29.7.0
jest-regex-util@29.6.3: {} jest-regex-util@29.6.3: {}
@@ -4326,9 +4391,8 @@ snapshots:
dependencies: dependencies:
typescript: 5.4.4 typescript: 5.4.4
ts-jest@29.1.2(@babel/core@7.24.4)(jest@29.7.0)(typescript@5.4.4): ts-jest@29.1.2(@babel/core@7.24.4)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.4))(jest@29.7.0(@types/node@20.12.4))(typescript@5.4.4):
dependencies: dependencies:
'@babel/core': 7.24.4
bs-logger: 0.2.6 bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0 fast-json-stable-stringify: 2.1.0
jest: 29.7.0(@types/node@20.12.4) jest: 29.7.0(@types/node@20.12.4)
@@ -4339,6 +4403,10 @@ snapshots:
semver: 7.6.0 semver: 7.6.0
typescript: 5.4.4 typescript: 5.4.4
yargs-parser: 21.1.1 yargs-parser: 21.1.1
optionalDependencies:
'@babel/core': 7.24.4
'@jest/types': 29.6.3
babel-jest: 29.7.0(@babel/core@7.24.4)
tslib@1.14.1: {} tslib@1.14.1: {}
@@ -4358,6 +4426,8 @@ snapshots:
type-fest@4.15.0: {} type-fest@4.15.0: {}
typescript@3.9.10: {}
typescript@5.4.4: {} typescript@5.4.4: {}
undici-types@5.26.5: {} undici-types@5.26.5: {}
+10 -1
View File
@@ -56,6 +56,10 @@ async function getBuildCachePath(): Promise<string> {
const projectRootPath = getProjectRootPath(); const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options: ExecOptions = {}; const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath; options.cwd = projectRootPath;
options.listeners = { options.listeners = {
stdout: (data: Buffer) => { stdout: (data: Buffer) => {
@@ -153,7 +157,12 @@ export async function saveBuildCache(): Promise<void> {
await io.cp(buildCachePath, fullCachePath, { await io.cp(buildCachePath, fullCachePath, {
recursive: true, recursive: true,
}); });
await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')]); const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'build_cache_saved.txt')], options);
await cache.saveCache([buildCacheFolder], buildCacheKey); await cache.saveCache([buildCacheFolder], buildCacheKey);
} }
} }
+14
View File
@@ -27,6 +27,10 @@ async function getPackageCacheKey(): Promise<string> {
const projectRootPath = getProjectRootPath(); const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) { if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options: ExecOptions = {}; const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath; options.cwd = projectRootPath;
options.listeners = { options.listeners = {
stdout: (data: Buffer) => { stdout: (data: Buffer) => {
@@ -43,6 +47,10 @@ async function getPackageCacheKey(): Promise<string> {
async function getPackageCachePath(): Promise<string> { async function getPackageCachePath(): Promise<string> {
let packageCachePath = ''; let packageCachePath = '';
const options: ExecOptions = {}; const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.listeners = { options.listeners = {
stdout: (data: Buffer) => { stdout: (data: Buffer) => {
packageCachePath += data.toString(); packageCachePath += data.toString();
@@ -112,6 +120,12 @@ export async function savePackageCache(): Promise<void> {
await io.cp(packageCachePath, fullCachePath, { await io.cp(packageCachePath, fullCachePath, {
recursive: true, recursive: true,
}); });
const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
await exec('xmake', ['l', 'os.touch', path.join(fullCachePath, 'package_cache_saved.txt')], options);
await cache.saveCache([packageCacheFolder], packageCacheKey); await cache.saveCache([packageCacheFolder], packageCacheKey);
} }
} }
+2 -2
View File
@@ -14,7 +14,7 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
let ver = version.version; let ver = version.version;
switch (version.type) { switch (version.type) {
case 'heads': { case 'heads': {
const arch = os.arch() === 'x64' ? 'win64' : 'win32'; const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
const latestver = latest.version; const latestver = latest.version;
if (ver !== 'dev' && ver !== 'master') { if (ver !== 'dev' && ver !== 'master') {
ver = latestver; ver = latestver;
@@ -28,7 +28,7 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
throw new Error('Sha builds for windows is not supported'); throw new Error('Sha builds for windows is not supported');
} }
case 'tags': { case 'tags': {
const arch = os.arch() === 'x64' ? 'win64' : 'win32'; const arch = os.arch() === 'arm64' ? 'arm64' : os.arch() === 'x64' ? 'win64' : 'win32';
return semver.gt(ver, '2.2.6') 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}.${arch}.exe`
: `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`; : `https://github.com/xmake-io/xmake/releases/download/${ver}/xmake-${ver}.exe`;