Compare commits

...

78 Commits

24 changed files with 85633 additions and 64518 deletions
+2 -6
View File
@@ -20,9 +20,9 @@ rules:
- 1 - 1
- allowWithDecorator: true - allowWithDecorator: true
allowStaticOnly: true allowStaticOnly: true
'@typescript-eslint/no-parameter-properties': '@typescript-eslint/parameter-properties':
- 1 - 1
- allows: [protected readonly, private readonly, public readonly, readonly] - allow: [protected readonly, private readonly, public readonly, readonly]
'@typescript-eslint/no-throw-literal': [2] '@typescript-eslint/no-throw-literal': [2]
'no-unused-vars': [0] 'no-unused-vars': [0]
'@typescript-eslint/no-unused-vars': '@typescript-eslint/no-unused-vars':
@@ -33,9 +33,5 @@ rules:
'@typescript-eslint/prefer-function-type': [1] '@typescript-eslint/prefer-function-type': [1]
'@typescript-eslint/prefer-nullish-coalescing': [1] '@typescript-eslint/prefer-nullish-coalescing': [1]
'@typescript-eslint/prefer-optional-chain': [1] '@typescript-eslint/prefer-optional-chain': [1]
'@typescript-eslint/ban-types':
- 1
- types:
object: false
no-void: [1, { allowAsStatement: true }] no-void: [1, { allowAsStatement: true }]
eqeqeq: [1, smart] eqeqeq: [1, smart]
+12 -14
View File
@@ -8,30 +8,28 @@ jobs:
checkin: checkin:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: concurrency:
matrix: group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-checkin
node-version: [16.x] cancel-in-progress: true
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- name: install - name: install
run: yarn install --frozen-lockfile uses: wyvox/action-setup-pnpm@v3
with:
node-version: 23
pnpm-version: 9
- name: build - name: build
run: yarn build run: pnpm build
- name: test - name: test
run: yarn test run: pnpm test
- name: release - name: release
run: yarn release run: pnpm release
- name: 'check for uncommitted changes' - name: 'check for uncommitted changes'
# Ensure no changes # Ensure no changes
run: | run: |
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 'yarn release' and check in all changes." echo "::error::Found changed files after build. Please run 'pnpm release' and check in all changes."
exit 1 exit 1
fi fi
+16 -4
View File
@@ -5,9 +5,13 @@ on:
jobs: jobs:
build: build:
concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.os }}-${{ matrix.version }}-test
cancel-in-progress: true
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 }}
@@ -17,9 +21,17 @@ jobs:
- 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-key: ${{ matrix.version }}
build-cache: true
build-cache-key: ${{ matrix.version }}
package-cache: true
package-cache-key: ${{ matrix.version }}
project-path: 'tests/sample'
- name: Run tests - name: Run tests
run: | run: |
xmake --version xmake --version
xmake create -P test cd tests/sample
xmake build -P test xmake -y -vD
xmake run -P test xmake run
+23 -1
View File
@@ -1 +1,23 @@
node_modules # dependencies
/node_modules/
# IDEs and editors
/.idea
.project
*.log
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# System Files
.DS_Store
Thumbs.db
+2 -2
View File
@@ -1,5 +1,5 @@
{ {
"npm.packageManager": "yarn", "npm.packageManager": "pnpm",
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue"], "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue"],
"eslint.enable": true, "eslint.enable": true,
"files.autoSave": "off", "files.autoSave": "off",
@@ -7,7 +7,7 @@
"editor.tabSize": 4, "editor.tabSize": 4,
"editor.formatOnSave": false, "editor.formatOnSave": false,
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.eslint": true "source.fixAll.eslint": "explicit"
}, },
"[typescript]": { "[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint" "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+80 -9
View File
@@ -11,7 +11,7 @@ See [action.yml](./action.yml).
## Example ## Example
Use latest version: ### Use latest version
```yml ```yml
uses: xmake-io/github-action-setup-xmake@v1 uses: xmake-io/github-action-setup-xmake@v1
@@ -19,7 +19,7 @@ with:
xmake-version: latest xmake-version: latest
``` ```
Use specified version: ### Use specified version
```yml ```yml
uses: xmake-io/github-action-setup-xmake@v1 uses: xmake-io/github-action-setup-xmake@v1
@@ -27,7 +27,7 @@ with:
xmake-version: '2.5.3' xmake-version: '2.5.3'
``` ```
Use specified branch: ### Use specified branch
```yml ```yml
uses: xmake-io/github-action-setup-xmake@v1 uses: xmake-io/github-action-setup-xmake@v1
@@ -35,7 +35,7 @@ with:
xmake-version: branch@master xmake-version: branch@master
``` ```
Use semver: ### Use semver
```yml ```yml
uses: xmake-io/github-action-setup-xmake@v1 uses: xmake-io/github-action-setup-xmake@v1
@@ -43,29 +43,89 @@ with:
xmake-version: '>=2.2.6 <=2.5.3' xmake-version: '>=2.2.6 <=2.5.3'
``` ```
Use action cache: ### Cache xmake
```yml ```yml
uses: xmake-io/github-action-setup-xmake@v1 uses: xmake-io/github-action-setup-xmake@v1
with: with:
xmake-version: '2.7.2' xmake-version: '2.9.7'
actions-cache-folder: '.xmake-cache' actions-cache-folder: '.xmake-cache'
``` ```
### Cache xmake with cachekey
```yml
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.7'
actions-cache-folder: '.xmake-cache'
actions-cache-key: 'archlinux-ci'
```
### Cache packages
```yml
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.7'
package-cache: true
package-cache-key: 'archlinux-ci'
project-path: 'myproject' # we need to compute packages hashkey for project
```
### Cache build
By default, xmake disables build cache when building on ci, so we need to enable it first.
```bash
$ xmake f --policies=build.ccache:y
```
And xmake v2.9.8 will enable it by default if action/build-cache is enabled.
```yml
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.7'
build-cache: true
build-cache-key: 'archlinux-ci'
```
Cache build with the specific project path.
```yml
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.7'
build-cache: true
project-path: 'myproject' # we can get the build cache path from project.
```
Cache build with the specific build path.
```yml
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: '2.9.7'
build-cache: true
build-cache-path: 'build/.build_cache'
```
## Contributing ## Contributing
### Prepare development environment ### Prepare development environment
```bash ```bash
yarn install pnpm install
``` ```
### Draft a new release ### Draft a new release
```bash ```bash
yarn release pnpm release
git add . git add .
yarn version git commit -m "build: release"
pnpm version [new-version]
# for a minor version or patch of v1 # for a minor version or patch of v1
git tag --delete v1 git tag --delete v1
@@ -74,3 +134,14 @@ git tag v1
git push origin master git push origin master
git push --tags --force git push --tags --force
``` ```
### Development and debug
```bash
git branch test
git checkout test
pnpm build
pnpm release
git-commit -a -m "..."
git push origin test
```
+24 -1
View File
@@ -13,6 +13,29 @@ inputs:
actions-cache-folder: actions-cache-folder:
description: 'Directory to cache xmake in. This folder will go under $GITHUB_HOME (I.e. build dir) and be cached using @actions/cache.' description: 'Directory to cache xmake in. This folder will go under $GITHUB_HOME (I.e. build dir) and be cached using @actions/cache.'
default: '' default: ''
actions-cache-key:
description: The actions cache key.
default: ''
package-cache:
description: Enable package cache.
default: false
package-cache-key:
description: The packages cache key.
default: ''
project-path:
description: The project root path.
default: ''
build-cache:
description: Enable build cache.
default: false
build-cache-path:
description: The build cache path.
default: ''
build-cache-key:
description: The build cache key.
default: ''
runs: runs:
using: 'node16' using: 'node20'
main: 'dist/index.js' main: 'dist/index.js'
post: 'dist/index.js'
+74339 -60876
View File
File diff suppressed because one or more lines are too long
+6138
View File
File diff suppressed because it is too large Load Diff
+23 -23
View File
@@ -1,6 +1,6 @@
{ {
"name": "github-action-setup-xmake", "name": "github-action-setup-xmake",
"version": "1.1.0", "version": "1.2.1",
"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",
@@ -10,37 +10,37 @@
"scripts": { "scripts": {
"watch": "tsc --watch", "watch": "tsc --watch",
"build": "ncc build src/index.ts", "build": "ncc build src/index.ts",
"rebuild": "yarn clean && yarn build", "rebuild": "pnpm clean && pnpm build",
"clean": "rimraf dist", "clean": "rimraf dist",
"lint": "eslint --fix src/**/*.ts", "lint": "eslint --fix src/**/*.ts",
"format": "prettier --write .", "format": "prettier --write .",
"test": "jest", "test": "jest",
"release": "yarn clean && yarn format && yarn lint && yarn build" "release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
}, },
"dependencies": { "dependencies": {
"@actions/cache": "^3.0.6", "@actions/cache": "^4.0.3",
"@actions/core": "^1.10.0", "@actions/core": "^1.11.1",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1",
"@actions/io": "^1.1.2", "@actions/io": "^1.1.3",
"@actions/tool-cache": "^2.0.1", "@actions/tool-cache": "^2.0.2",
"semver": "^7.3.5" "semver": "^7.7.2"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^26.0.24", "@types/jest": "^29.5.12",
"@types/node": "^16.3.2", "@types/node": "^20.12.4",
"@types/semver": "^7.3.7", "@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "^4.28.3", "@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^4.28.3", "@typescript-eslint/parser": "^7.5.0",
"@vercel/ncc": "^0.34.0", "@vercel/ncc": "^0.38.1",
"eslint": "^7.30.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^3.4.0", "eslint-plugin-prettier": "^5.1.3",
"jest": "^27.0.6", "jest": "^29.7.0",
"prettier": "^2.3.2", "prettier": "^3.2.5",
"rimraf": "^3.0.2", "rimraf": "^5.0.5",
"ts-jest": "^27.0.3", "ts-jest": "^29.1.2",
"type-fest": "^1.2.2", "type-fest": "^4.15.0",
"typescript": "^4.3.5" "typescript": "^5.4.4"
}, },
"contributors": [ "contributors": [
"Yu Zhu" "Yu Zhu"
+4483
View File
File diff suppressed because it is too large Load Diff
+168
View File
@@ -0,0 +1,168 @@
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';
function getBuildTime(hours?: string): string {
let key = 'BuildTime';
if (hours && hours !== '') {
key = key + hours;
}
let buildTime = core.getState(key);
if (!buildTime || buildTime === '') {
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0');
if (!hours || hours === '') {
hours = String(now.getHours()).padStart(2, '0');
}
buildTime = `${year}${month}${day}_${hours}`;
core.saveState(key, buildTime);
}
return buildTime;
}
function getProjectRootPath(): string {
let projectRootPath = core.getInput('project-path');
if (!projectRootPath) {
projectRootPath = process.cwd();
}
projectRootPath = projectRootPath.trim();
if (projectRootPath && projectRootPath !== '' && !path.isAbsolute(projectRootPath)) {
projectRootPath = path.join(process.cwd(), projectRootPath);
}
return projectRootPath;
}
function getBuildCacheKey(buildCacheTime?: string): string {
let buildCacheKey = core.getInput('build-cache-key');
if (!buildCacheKey) {
buildCacheKey = '';
}
if (!buildCacheTime || buildCacheTime === '') {
buildCacheTime = getBuildTime();
}
return `xmake-build-cache-${buildCacheKey}-${buildCacheTime}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
}
async function getBuildCachePath(): Promise<string> {
let buildCachePath = core.getInput('build-cache-path');
if (!buildCachePath) {
buildCachePath = '';
const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath;
options.listeners = {
stdout: (data: Buffer) => {
buildCachePath += data.toString();
},
};
await exec(
'xmake',
[
'l',
'-c',
'import("core.project.config"); import("private.cache.build_cache"); config.load(); print(build_cache.rootdir())',
],
options,
);
buildCachePath = buildCachePath.trim();
if (buildCachePath !== '' && !path.isAbsolute(buildCachePath)) {
buildCachePath = path.join(projectRootPath, buildCachePath);
}
} else {
buildCachePath = 'build/.build_cache';
}
}
return buildCachePath;
}
function getBuildCacheFolder(): string {
return '.xmake-build-cache';
}
export async function loadBuildCache(): Promise<void> {
const buildCache = core.getBooleanInput('build-cache');
if (!buildCache) {
return;
}
// export $XMAKE_ACTION_BUILD_CACHE, xmake will check it and enable build cache by default on ci.
core.exportVariable('XMAKE_ACTION_BUILD_CACHE', 'true');
const buildCacheFolder = getBuildCacheFolder();
const buildCachePath = await getBuildCachePath();
if (buildCacheFolder && process.env.GITHUB_WORKSPACE) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, buildCacheFolder);
const filepath = path.join(fullCachePath, 'build_cache_saved.txt');
// Since action/cache cannot overwrite updates, we try to restore the cache from the last 24 hours.
const now = new Date();
for (let i = 0; i < 24; i++) {
const hours = now.getHours() - i;
if (hours < 0) {
break;
}
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);
}
if (fsutils.isFile(filepath)) {
if (fsutils.isDir(buildCachePath)) {
await io.rmRF(buildCachePath);
}
await io.cp(fullCachePath, buildCachePath, {
recursive: true,
});
/* Even if the historical cache is hit, we need to update to the latest cache
* Therefore, only when the latest cache is hit, it is a real hit, and we no longer need to update the cache.
*/
if (i === 0) {
core.saveState('hitBuildCache', 'true');
}
break;
}
}
if (!fsutils.isFile(filepath)) {
core.warning(`No cached files found at path "${fullCachePath}".`);
await io.rmRF(fullCachePath);
}
}
}
export async function saveBuildCache(): Promise<void> {
const buildCache = core.getBooleanInput('build-cache');
if (!buildCache) {
return;
}
const buildCacheFolder = getBuildCacheFolder();
const buildCacheKey = getBuildCacheKey();
const buildCachePath = await getBuildCachePath();
const hitBuildCache = !!core.getState('hitBuildCache');
if (!hitBuildCache && buildCacheFolder && process.env.GITHUB_WORKSPACE && fsutils.isDir(buildCachePath)) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, buildCacheFolder);
core.info(`Save build cache path: ${buildCachePath} to ${fullCachePath}, key: ${buildCacheKey}`);
await io.cp(buildCachePath, fullCachePath, {
recursive: true,
});
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);
}
}
+22
View File
@@ -0,0 +1,22 @@
import * as fs from 'fs';
export function isFile(filepath: string): boolean {
try {
fs.accessSync(filepath, fs.constants.F_OK);
return true;
} catch {
return false;
}
}
export function isDir(filepath: string): boolean {
try {
const stats = fs.statSync(filepath);
if (stats.isDirectory()) {
return true;
}
return false;
} catch {
return false;
}
}
+1 -1
View File
@@ -21,7 +21,7 @@ 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, tag] = line.trim().split('\t');
if (ref && tag && tag.startsWith('refs/')) { if (ref && tag?.startsWith('refs/')) {
const tagPath = tag.split('/').splice(1); const tagPath = tag.split('/').splice(1);
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
let ldata = data as any; // eslint-disable-line @typescript-eslint/no-unsafe-assignment let ldata = data as any; // eslint-disable-line @typescript-eslint/no-unsafe-assignment
+22 -14
View File
@@ -1,24 +1,32 @@
import * as core from '@actions/core'; import * as core from '@actions/core';
import { exec } from '@actions/exec'; import * as stateHelper from './state-helper';
import * as os from 'os'; import { installXmake } from './install';
import { selectVersion } from './versions'; import { loadBuildCache, saveBuildCache } from './build-cache';
import { winInstall } from './win-install'; import { loadPackageCache, savePackageCache } from './package-cache';
import { unixInstall } from './unix-install';
async function run(): Promise<void> { async function run(): Promise<void> {
try { try {
const version = await selectVersion(); await installXmake();
if (os.platform() === 'win32' || os.platform() === 'cygwin') { await loadBuildCache();
const latest = await selectVersion('latest'); await loadPackageCache();
await winInstall(version, latest);
} else {
await unixInstall(version);
}
await exec('xmake --version');
} catch (error) { } catch (error) {
const ex = error as Error; const ex = error as Error;
core.setFailed(ex.message); core.setFailed(ex.message);
} }
} }
run().catch((e) => core.error(e)); async function saveCache(): Promise<void> {
try {
await saveBuildCache();
await savePackageCache();
} catch (error) {
const ex = error as Error;
core.setFailed(ex.message);
}
}
if (!stateHelper.IsPost) {
run().catch((e: Error) => core.error(e));
} else {
saveCache().catch((e: Error) => core.error(e));
}
+16
View File
@@ -0,0 +1,16 @@
import { exec } from '@actions/exec';
import * as os from 'os';
import { selectVersion } from './versions';
import { winInstall } from './win-install';
import { unixInstall } from './unix-install';
export async function installXmake(): Promise<void> {
const version = await selectVersion();
if (os.platform() === 'win32' || os.platform() === 'cygwin') {
const latest = await selectVersion('latest');
await winInstall(version, latest);
} else {
await unixInstall(version);
}
await exec('xmake --root --version');
}
+131
View File
@@ -0,0 +1,131 @@
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';
function getProjectRootPath(): string {
let projectRootPath = core.getInput('project-path');
if (!projectRootPath) {
projectRootPath = process.cwd();
}
projectRootPath = projectRootPath.trim();
if (projectRootPath && projectRootPath !== '' && !path.isAbsolute(projectRootPath)) {
projectRootPath = path.join(process.cwd(), projectRootPath);
}
return projectRootPath;
}
async function getPackageCacheKey(): Promise<string> {
let packageCacheKey = core.getInput('package-cache-key');
if (!packageCacheKey) {
packageCacheKey = '';
}
let packageCacheHash = '';
const projectRootPath = getProjectRootPath();
if (projectRootPath && projectRootPath !== '' && fsutils.isDir(projectRootPath)) {
const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.cwd = projectRootPath;
options.listeners = {
stdout: (data: Buffer) => {
packageCacheHash += data.toString();
},
};
await exec('xmake', ['repo', '--update']);
await exec('xmake', ['l', 'utils.ci.packageskey'], options);
packageCacheHash = packageCacheHash.trim();
}
return `xmake-package-cache-${packageCacheKey}-${packageCacheHash}-${os.arch()}-${os.platform()}-${process.env.RUNNER_OS ?? 'unknown'}`;
}
async function getPackageCachePath(): Promise<string> {
let packageCachePath = '';
const options: ExecOptions = {};
options.env = {
...process.env,
XMAKE_ROOT: 'y',
};
options.listeners = {
stdout: (data: Buffer) => {
packageCachePath += data.toString();
},
};
await exec('xmake', ['l', '-c', 'import("core.package.package"); print(package.installdir())'], options);
packageCachePath = packageCachePath.trim();
return packageCachePath;
}
function getPackageCacheFolder(): string {
return '.xmake-package-cache';
}
export async function loadPackageCache(): Promise<void> {
const packageCache = core.getBooleanInput('package-cache');
if (!packageCache) {
return;
}
const packageCacheFolder = getPackageCacheFolder();
const packageCacheKey = await getPackageCacheKey();
const packageCachePath = await getPackageCachePath();
if (!packageCachePath || packageCachePath === '') {
return;
}
if (packageCacheFolder && process.env.GITHUB_WORKSPACE) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, packageCacheFolder);
const filepath = path.join(fullCachePath, 'package_cache_saved.txt');
if (!fsutils.isFile(filepath)) {
core.info(`Restore package cache path: ${fullCachePath} to ${packageCachePath}, key: ${packageCacheKey}`);
await cache.restoreCache([packageCacheFolder], packageCacheKey);
}
if (fsutils.isFile(filepath)) {
if (fsutils.isDir(packageCachePath)) {
await io.rmRF(packageCachePath);
}
await io.cp(fullCachePath, packageCachePath, {
recursive: true,
});
core.saveState('hitPackageCache', 'true');
} else {
core.warning(`No cached files found at path "${fullCachePath}".`);
await io.rmRF(fullCachePath);
}
}
}
export async function savePackageCache(): Promise<void> {
const packageCache = core.getBooleanInput('package-cache');
if (!packageCache) {
return;
}
const packageCacheFolder = getPackageCacheFolder();
const packageCacheKey = await getPackageCacheKey();
const packageCachePath = await getPackageCachePath();
if (!packageCachePath || packageCachePath === '') {
return;
}
const hitPackageCache = !!core.getState('hitPackageCache');
if (!hitPackageCache && packageCacheFolder && process.env.GITHUB_WORKSPACE && fsutils.isDir(packageCachePath)) {
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, packageCacheFolder);
core.info(`Save package cache path: ${packageCachePath} to ${fullCachePath}, key: ${packageCacheKey}`);
await io.cp(packageCachePath, fullCachePath, {
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);
}
}
+12
View File
@@ -0,0 +1,12 @@
import * as core from '@actions/core';
/**
* Indicates whether the POST action is running
*/
export const IsPost = !!core.getState('isPost');
// Publish a variable so that when the POST action runs, it can determine it should run the cleanup logic.
// This is necessary since we don't have a separate entry point.
if (!IsPost) {
core.saveState('isPost', 'true');
}
+14 -3
View File
@@ -11,18 +11,28 @@ import * as git from './git';
import { Version } from './interfaces'; import { Version } from './interfaces';
async function install(sourceDir: string, binDir: string): Promise<void> { async function install(sourceDir: string, binDir: string): Promise<void> {
await exec('make', ['build'], { cwd: sourceDir }); if (fs.existsSync(path.join(sourceDir, 'configure'))) {
await exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir }); await exec('sh', ['./configure'], { cwd: sourceDir });
await exec('make', ['-j6'], { cwd: sourceDir });
await exec('make', ['install', `PREFIX=${binDir}`], { cwd: sourceDir });
} else {
await exec('make', ['-j6'], { cwd: sourceDir });
await exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
}
} }
export async function unixInstall(version: Version): Promise<void> { export async function unixInstall(version: Version): Promise<void> {
let toolDir = ''; let toolDir = '';
const actionsCacheFolder = core.getInput('actions-cache-folder'); const actionsCacheFolder = core.getInput('actions-cache-folder');
let actionsCacheKey = core.getInput('actions-cache-key');
if (!actionsCacheKey) {
actionsCacheKey = '';
}
if (version.type !== 'local') { if (version.type !== 'local') {
const ver = version.version; const ver = version.version;
const sha = version.sha; const sha = version.sha;
const cacheKey = `xmake-cache-${ver}-${sha}-${os.arch()}-${os.platform()}-${ const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${os.arch()}-${os.platform()}-${
process.env.RUNNER_OS ?? 'unknown' process.env.RUNNER_OS ?? 'unknown'
}`; }`;
@@ -36,6 +46,7 @@ export async function unixInstall(version: Version): Promise<void> {
} }
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK); fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
toolDir = fullCachePath; toolDir = fullCachePath;
core.info(`cache path: ${toolDir}, key: ${cacheKey}`);
} catch { } catch {
core.warning(`No cached files found at path "${fullCachePath}".`); core.warning(`No cached files found at path "${fullCachePath}".`);
await io.rmRF(fullCachePath); await io.rmRF(fullCachePath);
+73 -4
View File
@@ -2,17 +2,23 @@ import * as core from '@actions/core';
import { exec } from '@actions/exec'; import { exec } from '@actions/exec';
import * as io from '@actions/io'; import * as io from '@actions/io';
import * as toolCache from '@actions/tool-cache'; import * as toolCache from '@actions/tool-cache';
import * as cache from '@actions/cache';
import * as os from 'os'; import * as os from 'os';
import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import * as semver from 'semver'; import * as semver from 'semver';
import * as git from './git';
import { Version, GitVersion } from './interfaces'; import { Version, GitVersion } from './interfaces';
function getInstallerUrl(version: GitVersion, latest: GitVersion): string { function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
const 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') {
ver = latestver;
}
return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`; return `https://github.com/xmake-io/xmake/releases/download/${latestver}/xmake-${ver}.${arch}.exe`;
} }
case 'pull': { case 'pull': {
@@ -22,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`;
@@ -35,12 +41,48 @@ function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
} }
} }
async function installFromSource(xmakeBin: string, sourceDir: string, binDir: string): Promise<void> {
await exec(xmakeBin, ['-y'], { 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, latest: Version): Promise<void> {
if (version.type === 'local' || latest.type === 'local') { if (version.type === 'local' || latest.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');
let actionsCacheKey = core.getInput('actions-cache-key');
if (!actionsCacheKey) {
actionsCacheKey = '';
}
const ver = version.version; const ver = version.version;
let toolDir = toolCache.find('xmake', ver); const sha = version.sha;
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.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
try {
try {
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
} catch {
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 {
core.warning(`No cached files found at path "${fullCachePath}".`);
await io.rmRF(fullCachePath);
}
} else {
toolDir = toolCache.find('xmake', ver);
}
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 = getInstallerUrl(version, latest);
@@ -65,6 +107,33 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
await io.rmRF(installer); await io.rmRF(installer);
return cacheDir; return cacheDir;
}); });
await exec(`"${toolDir}/xmake.exe" --version`);
if (version.type === 'heads') {
const sourceDir = await core.group(`download xmake source ${String(version)}`, () =>
git.create(version.repo, version.sha),
);
toolDir = await core.group(`install xmake source ${String(version)}`, async () => {
const binDir = path.join(os.tmpdir(), `xmake-${version.sha}`);
await installFromSource(`${toolDir}/xmake.exe`, `${sourceDir}/core`, binDir);
const cacheDir = await toolCache.cacheDir(binDir, 'xmake', ver);
await io.rmRF(binDir);
await git.cleanup(version.sha);
return cacheDir;
});
}
if (toolDir) {
let cacheDir = '';
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
await io.cp(toolDir, cacheDir, {
recursive: true,
});
await cache.saveCache([actionsCacheFolder], cacheKey);
toolDir = cacheDir;
}
}
} }
core.addPath(toolDir); core.addPath(toolDir);
} }
+8
View File
@@ -0,0 +1,8 @@
# Xmake cache
.xmake/
build/
# MacOS Cache
.DS_Store
+6
View File
@@ -0,0 +1,6 @@
#include <iostream>
int main(int argc, char** argv) {
std::cout << "hello world!" << std::endl;
return 0;
}
+9
View File
@@ -0,0 +1,9 @@
add_rules("mode.debug", "mode.release")
add_requires("libpng", "libogg", {system = false})
target("sample")
set_kind("binary")
add_files("src/*.cpp")
add_packages("libpng", "libogg")
-3551
View File
File diff suppressed because it is too large Load Diff