1.1.2

Bump undici from 5.28.2 to 5.28.3

.eslintrc.yml

@@ -20,9 +20,9 @@ rules:
     - 1
     - allowWithDecorator: true
       allowStaticOnly: true
-  '@typescript-eslint/no-parameter-properties':
+  '@typescript-eslint/parameter-properties':
     - 1
-    - allows: [protected readonly, private readonly, public readonly, readonly]
+    - allow: [protected readonly, private readonly, public readonly, readonly]
   '@typescript-eslint/no-throw-literal': [2]
   'no-unused-vars': [0]
   '@typescript-eslint/no-unused-vars':
@@ -33,9 +33,5 @@ rules:
   '@typescript-eslint/prefer-function-type': [1]
   '@typescript-eslint/prefer-nullish-coalescing': [1]
   '@typescript-eslint/prefer-optional-chain': [1]
-  '@typescript-eslint/ban-types':
-    - 1
-    - types:
-        object: false
   no-void: [1, { allowAsStatement: true }]
   eqeqeq: [1, smart]

.github/workflows/checkin.yml

@@ -8,30 +8,28 @@ jobs:
   checkin:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [16.x]
+    concurrency:
+      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-checkin
+      cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+      - uses: actions/checkout@v4
       - name: install
-        run: yarn install --frozen-lockfile
+        uses: wyvox/action-setup-pnpm@v3
+        with:
+          node-version: 23
+          pnpm-version: 9
       - name: build
-        run: yarn build
+        run: pnpm build
       - name: test
-        run: yarn test
+        run: pnpm test
       - name: release
-        run: yarn release
+        run: pnpm release
       - name: 'check for uncommitted changes'
         # Ensure no changes
         run: |
           git add .
           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
           fi

.github/workflows/test.yml

@@ -5,6 +5,10 @@ on:
 
 jobs:
   build:
+    concurrency:
+      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-${{ matrix.os }}-${{ matrix.version }}-test
+      cancel-in-progress: true
+
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
@@ -14,9 +18,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - uses: xmake-io/github-action-setup-xmake@master
+      - uses: xmake-io/github-action-setup-xmake@test
         with:
           xmake-version: ${{ matrix.version }}
+          actions-cache-folder: '.xmake-cache'
+
       - name: Run tests
         run: |
           xmake --version

.gitignore

@@ -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

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "npm.packageManager": "yarn",
+  "npm.packageManager": "pnpm",
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "vue"],
   "eslint.enable": true,
   "files.autoSave": "off",
@@ -7,7 +7,7 @@
   "editor.tabSize": 4,
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "[typescript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"

README.md

@@ -52,20 +52,31 @@ with:
   actions-cache-folder: '.xmake-cache'
 ```
 
+Use action cache with cachekey:
+
+```yml
+uses: xmake-io/github-action-setup-xmake@v1
+with:
+  xmake-version: '2.7.2'
+  actions-cache-folder: '.xmake-cache'
+  actions-cache-key: 'archlinux-ci'
+```
+
 ## Contributing
 
 ### Prepare development environment
 
 ```bash
-yarn install
+pnpm install
 ```
 
 ### Draft a new release
 
 ```bash
-yarn release
+pnpm release
 git add .
-yarn version
+git commit -m "build: release"
+pnpm version [new-version]
 
 # for a minor version or patch of v1
 git tag --delete v1
@@ -74,3 +85,14 @@ git tag v1
 git push origin master
 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
+```

action.yml

@@ -13,6 +13,9 @@ inputs:
   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.'
     default: ''
+  actions-cache-key:
+    description: The actions cache key.
+    default: ''
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-action-setup-xmake",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Set up your GitHub Actions workflow with a specific version of xmake",
   "main": "dist/index.js",
   "author": "OpportunityLiu",
@@ -10,37 +10,37 @@
   "scripts": {
     "watch": "tsc --watch",
     "build": "ncc build src/index.ts",
-    "rebuild": "yarn clean && yarn build",
+    "rebuild": "pnpm clean && pnpm build",
     "clean": "rimraf dist",
     "lint": "eslint --fix src/**/*.ts",
     "format": "prettier --write .",
     "test": "jest",
-    "release": "yarn clean && yarn format && yarn lint && yarn build"
+    "release": "pnpm clean && pnpm format && pnpm lint && pnpm build"
   },
   "dependencies": {
-    "@actions/cache": "^3.0.6",
-    "@actions/core": "^1.10.0",
+    "@actions/cache": "^3.2.4",
+    "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.1.2",
+    "@actions/io": "^1.1.3",
     "@actions/tool-cache": "^2.0.1",
-    "semver": "^7.3.5"
+    "semver": "^7.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.24",
-    "@types/node": "^16.3.2",
-    "@types/semver": "^7.3.7",
-    "@typescript-eslint/eslint-plugin": "^4.28.3",
-    "@typescript-eslint/parser": "^4.28.3",
-    "@vercel/ncc": "^0.34.0",
-    "eslint": "^7.30.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "jest": "^27.0.6",
-    "prettier": "^2.3.2",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.3",
-    "type-fest": "^1.2.2",
-    "typescript": "^4.3.5"
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.12.4",
+    "@types/semver": "^7.5.8",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
+    "@vercel/ncc": "^0.38.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "jest": "^29.7.0",
+    "prettier": "^3.2.5",
+    "rimraf": "^5.0.5",
+    "ts-jest": "^29.1.2",
+    "type-fest": "^4.15.0",
+    "typescript": "^5.4.4"
   },
   "contributors": [
     "Yu Zhu"

src/git.ts

@@ -21,7 +21,7 @@ export async function lsRemote(repo: Repo): Promise<RefDic> {
     const data: RefDic = { heads: {}, tags: {}, pull: {} };
     out.split('\n').forEach((line) => {
         const [ref, tag] = line.trim().split('\t');
-        if (ref && tag && tag.startsWith('refs/')) {
+        if (ref && tag?.startsWith('refs/')) {
             const tagPath = tag.split('/').splice(1);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let ldata = data as any; // eslint-disable-line @typescript-eslint/no-unsafe-assignment

src/index.ts

@@ -14,11 +14,11 @@ async function run(): Promise<void> {
         } else {
             await unixInstall(version);
         }
-        await exec('xmake --version');
+        await exec('xmake --root --version');
     } catch (error) {
         const ex = error as Error;
         core.setFailed(ex.message);
     }
 }
 
-run().catch((e) => core.error(e));
+run().catch((e: Error) => core.error(e));

src/unix-install.ts

@@ -11,18 +11,28 @@ import * as git from './git';
 import { Version } from './interfaces';
 
 async function install(sourceDir: string, binDir: string): Promise<void> {
-    await exec('make', ['build'], { cwd: sourceDir });
-    await exec('make', ['install', `prefix=${binDir}`], { cwd: sourceDir });
+    if (fs.existsSync(path.join(sourceDir, 'configure'))) {
+        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> {
     let toolDir = '';
     const actionsCacheFolder = core.getInput('actions-cache-folder');
+    let actionsCacheKey = core.getInput('actions-cache-key');
+    if (!actionsCacheKey) {
+        actionsCacheKey = '';
+    }
 
     if (version.type !== 'local') {
         const ver = version.version;
         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'
         }`;
 
@@ -36,6 +46,7 @@ export async function unixInstall(version: Version): Promise<void> {
                 }
                 fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), 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);

src/win-install.ts

@@ -2,9 +2,12 @@ import * as core from '@actions/core';
 import { exec } from '@actions/exec';
 import * as io from '@actions/io';
 import * as toolCache from '@actions/tool-cache';
+import * as cache from '@actions/cache';
 import * as os from 'os';
+import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
+import * as git from './git';
 import { Version, GitVersion } from './interfaces';
 
 function getInstallerUrl(version: GitVersion, latest: GitVersion): string {
@@ -35,12 +38,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> {
     if (version.type === 'local' || latest.type === 'local') {
         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;
-    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) {
         const installer = await core.group(`download xmake ${String(version)}`, async () => {
             const url = getInstallerUrl(version, latest);
@@ -65,6 +104,33 @@ export async function winInstall(version: Version, latest: Version): Promise<voi
             await io.rmRF(installer);
             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);
 }