wed150/github-action-setup-xmake
1
0
Fork 0
Code Issues Packages Projects Releases 2 Wiki Activity

match pr

Browse Source
This commit is contained in:
Opportunity
2020-05-24 00:59:25 +08:00
Unverified
parent 77cd51991f
commit 2feaa3232f
12 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/interfaces.js
Vendored
+9
View File
@@ -0,0 +1,9 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
function Sha(sha) {
sha = sha.trim().toLowerCase();
if (!/^[a-f0-9]{40}$/g.test(sha))
throw new Error(`Invalid sha value ${sha}`);
return sha;
}
exports.Sha = Sha;
dist/versions.js
Vendored
+12 -6
View File
@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const core = require("@actions/core");
const semver = require("semver");
const git_1 = require("./git");
const interfaces_1 = require("./interfaces");
let VERSIONS;
async function getVersions() {
if (VERSIONS)
@@ -70,21 +71,26 @@ async function selectSemver(version) {
return new VersionImpl(ver, sha, 'tags', ver);
}
async function selectSha(sha) {
sha = sha.toLowerCase();
if (!/^[a-f0-9]{40}$/gi.test(sha))
throw new Error(`Invalid sha value ${sha}`);
var _a;
const shaValue = interfaces_1.Sha(sha);
const versions = await getVersions();
for (const branch in versions.heads) {
if (versions.heads[branch] === sha) {
if (versions.heads[branch] === shaValue) {
return selectBranch(branch);
}
}
for (const tag in versions.tags) {
if (versions.tags[tag] === sha) {
if (versions.tags[tag] === shaValue) {
return selectSemver(tag);
}
}
return Promise.resolve(new VersionImpl(`sha#${sha}`, sha, 'sha', `commit ${sha.substr(0, 8)}`));
for (const pr in versions.pull) {
const prData = versions.pull[pr];
if (((_a = prData.merge) !== null && _a !== void 0 ? _a : prData.head) === shaValue) {
return selectPr(Number.parseInt(pr));
}
}
return Promise.resolve(new VersionImpl(`sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`));
}
async function selectVersion(version) {
// get version string
node_modules/.yarn-integrity
Generated Vendored
+4 -2
View File
@@ -13,7 +13,7 @@
"@actions/io@^1.0.1",
"@actions/tool-cache@^1.1.2",
"@types/jest@^25.1.4",
"@types/node@^13.9.8",
"@types/node@^14.0.5",
"@types/semver@^7.1.0",
"@typescript-eslint/eslint-plugin@^2.26.0",
"@typescript-eslint/parser@^2.26.0",
@@ -25,6 +25,7 @@
"rimraf@^3.0.2",
"semver@^7.1.3",
"ts-jest@^25.3.0",
"type-fest@^0.14.0",
"typescript@^3.8.3"
],
"lockfileEntries": {
@@ -97,7 +98,7 @@
"@types/jest@^25.1.4": "https://registry.npm.taobao.org/@types/jest/download/@types/jest-25.1.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjest%2Fdownload%2F%40types%2Fjest-25.1.4.tgz#9e9f1e59dda86d3fd56afce71d1ea1b331f6f760",
"@types/json-schema@^7.0.3": "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339",
"@types/node@*": "https://registry.npm.taobao.org/@types/node/download/@types/node-13.9.2.tgz?cache=0&sync_timestamp=1584566829623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349",
"@types/node@^13.9.8": "https://registry.npm.taobao.org/@types/node/download/@types/node-13.9.8.tgz#09976420fc80a7a00bf40680c63815ed8c7616f4",
"@types/node@^14.0.5": "https://registry.npm.taobao.org/@types/node/download/@types/node-14.0.5.tgz?cache=0&sync_timestamp=1590092201933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b",
"@types/prettier@^1.19.0": "https://registry.npm.taobao.org/@types/prettier/download/@types/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f",
"@types/semver@^7.1.0": "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.1.0.tgz#c8c630d4c18cd326beff77404887596f96408408",
"@types/stack-utils@^1.0.1": "https://registry.npm.taobao.org/@types/stack-utils/download/@types/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e",
@@ -616,6 +617,7 @@
"type-check@~0.3.2": "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72",
"type-detect@4.0.8": "https://registry.npm.taobao.org/type-detect/download/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c",
"type-fest@^0.11.0": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1",
"type-fest@^0.14.0": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.14.0.tgz#758d800f2dcc0de47a946a120d91ab17883523ad",
"type-fest@^0.8.1": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d",
"typedarray-to-buffer@^3.1.5": "https://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz?cache=0&sync_timestamp=1580310064722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypedarray-to-buffer%2Fdownload%2Ftypedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080",
"typescript@^3.8.3": "https://registry.npm.taobao.org/typescript/download/typescript-3.8.3.tgz?cache=0&sync_timestamp=1584688517009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypescript%2Fdownload%2Ftypescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061",
package.json
+2 -1
View File
@@ -26,7 +26,7 @@
},
"devDependencies": {
"@types/jest": "^25.1.4",
"@types/node": "^13.9.8",
"@types/node": "^14.0.5",
"@types/semver": "^7.1.0",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
@@ -37,6 +37,7 @@
"prettier": "^2.0.2",
"rimraf": "^3.0.2",
"ts-jest": "^25.3.0",
"type-fest": "^0.14.0",
"typescript": "^3.8.3"
}
}
src/git.ts
+4 -22
View File
@@ -2,30 +2,12 @@ import { exec } from '@actions/exec';
import * as io from '@actions/io';
import * as os from 'os';
import * as path from 'path';
import { Sha, RefDic } from './interfaces';
function makeOpt(ref: string): { cwd: string } {
function makeOpt(ref: Sha): { cwd: string } {
return { cwd: path.join(os.tmpdir(), `xmake-git-${ref}`) };
}
export type RefDic = {
/** branches */
heads: Record<string, string>;
/** tags */
tags: Record<string, string>;
/** pull requests */
pull: Record<
number,
{
/** the current state of the pull request */
head: string;
/** the current branch we're merging onto */
base?: string;
/** merge result */
merge?: string;
}
>;
};
export async function lsRemote(): Promise<RefDic> {
let out = '';
await exec('git', ['ls-remote', 'https://github.com/xmake-io/xmake.git'], {
@@ -55,7 +37,7 @@ export async function lsRemote(): Promise<RefDic> {
return data;
}
export async function create(ref: string): Promise<string> {
export async function create(ref: Sha): Promise<string> {
const opt = makeOpt(ref);
await io.rmRF(opt.cwd);
await io.mkdirP(opt.cwd);
@@ -67,7 +49,7 @@ export async function create(ref: string): Promise<string> {
return opt.cwd;
}
export async function cleanup(ref: string): Promise<void> {
export async function cleanup(ref: Sha): Promise<void> {
const opt = makeOpt(ref);
await io.rmRF(opt.cwd);
}
src/interfaces.ts
+33
View File
@@ -0,0 +1,33 @@
import { Opaque } from 'type-fest';
export type Sha = Opaque<string, 'sha'>;
export function Sha(sha: string): Sha {
sha = sha.trim().toLowerCase();
if (!/^[a-f0-9]{40}$/g.test(sha)) throw new Error(`Invalid sha value ${sha}`);
return sha as Sha;
}
export type RefDic = {
/** branches */
heads: Record<string, Sha>;
/** tags */
tags: Record<string, Sha>;
/** pull requests */
pull: Record<
number,
{
/** the current state of the pull request */
head: Sha;
/** the current branch we're merging onto */
base?: Sha;
/** merge result */
merge?: Sha;
}
>;
};
export interface Version {
version: string;
sha: Sha;
type: keyof RefDic | 'sha';
}
src/unix-install.ts
+1 -1
View File
@@ -6,7 +6,7 @@ import * as os from 'os';
import * as path from 'path';
import * as semver from 'semver';
import * as git from './git';
import { Version } from './versions';
import { Version } from './interfaces';
export async function unixInstall(version: Version): Promise<void> {
const ver = version.version;
src/version.spec.ts
+24
View File
@@ -332,6 +332,30 @@ describe('selectVersion', () => {
});
});
it('should return pr merge of sha', async () => {
await expect(selectVersion('sha@2f93475049575ed5e44699daa378239bc141aad3')).resolves.toEqual({
version: 'pr#217',
sha: '2f93475049575ed5e44699daa378239bc141aad3',
type: 'pull',
});
});
it('should not return pr head of sha if merge present', async () => {
await expect(selectVersion('sha@905a8607f3f31ab9efeb68684d40df8284683f3a')).resolves.toEqual({
version: 'sha#905a8607f3f31ab9efeb68684d40df8284683f3a',
sha: '905a8607f3f31ab9efeb68684d40df8284683f3a',
type: 'sha',
});
});
it('should return pr head of sha', async () => {
await expect(selectVersion('sha@af28dba1f52990cb7b6c3c8f69f1f1bcf017c90a')).resolves.toEqual({
version: 'pr#708',
sha: 'af28dba1f52990cb7b6c3c8f69f1f1bcf017c90a',
type: 'pull',
});
});
it('should return correct normalized sha', async () => {
await expect(selectVersion('sha@Af28dba1f52990cb7b6c3c8f69f1f1bcf017c90b')).resolves.toEqual({
version: 'sha#af28dba1f52990cb7b6c3c8f69f1f1bcf017c90b',
src/versions.ts
+13 -13
View File
@@ -1,12 +1,7 @@
import * as core from '@actions/core';
import * as semver from 'semver';
import { lsRemote, RefDic } from './git';
export interface Version {
version: string;
sha: string;
type: keyof RefDic | 'sha';
}
import { lsRemote } from './git';
import { RefDic, Sha, Version } from './interfaces';
let VERSIONS: RefDic | undefined;
@@ -16,7 +11,7 @@ async function getVersions(): Promise<RefDic> {
}
class VersionImpl implements Version {
constructor(readonly version: string, readonly sha: string, readonly type: Version['type'], toString: string) {
constructor(readonly version: string, readonly sha: Sha, readonly type: Version['type'], toString: string) {
this.#string = toString;
}
readonly #string: string;
@@ -63,20 +58,25 @@ async function selectSemver(version: string): Promise<Version> {
}
async function selectSha(sha: string): Promise<Version> {
sha = sha.toLowerCase();
if (!/^[a-f0-9]{40}$/gi.test(sha)) throw new Error(`Invalid sha value ${sha}`);
const shaValue = Sha(sha);
const versions = await getVersions();
for (const branch in versions.heads) {
if (versions.heads[branch] === sha) {
if (versions.heads[branch] === shaValue) {
return selectBranch(branch);
}
}
for (const tag in versions.tags) {
if (versions.tags[tag] === sha) {
if (versions.tags[tag] === shaValue) {
return selectSemver(tag);
}
}
return Promise.resolve(new VersionImpl(`sha#${sha}`, sha, 'sha', `commit ${sha.substr(0, 8)}`));
for (const pr in versions.pull) {
const prData = versions.pull[pr];
if ((prData.merge ?? prData.head) === shaValue) {
return selectPr(Number.parseInt(pr));
}
}
return Promise.resolve(new VersionImpl(`sha#${shaValue}`, shaValue, 'sha', `commit ${shaValue.substr(0, 8)}`));
}
export async function selectVersion(version?: string): Promise<Version> {
src/win-install.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import * as toolCache from '@actions/tool-cache';
import * as os from 'os';
import * as path from 'path';
import * as semver from 'semver';
import { Version } from './versions';
import { Version } from './interfaces';
function getInstallerUrl(version: Version): string {
const ver = version.version;
tsconfig.json
+10 -11
View File
@@ -1,13 +1,12 @@
{
"include": [
"src/**/*"
],
"compileOnSave": true,
"compilerOptions": {
"strict": true,
"moduleResolution": "node",
"module": "commonjs",
"target": "es2018",
"outDir": "dist"
}
"include": ["src/**/*"],
"compileOnSave": true,
"compilerOptions": {
"strict": true,
"moduleResolution": "node",
"module": "commonjs",
"target": "es2018",
"outDir": "dist",
"types": ["node", "jest"]
}
}
yarn.lock
+9 -4
View File
@@ -457,10 +457,10 @@
resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-13.9.2.tgz?cache=0&sync_timestamp=1584566829623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349"
integrity sha1-rOGIDANZTMPoAgbZaEcVfY5/o0k=
"@types/node@^13.9.8":
version "13.9.8"
resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-13.9.8.tgz#09976420fc80a7a00bf40680c63815ed8c7616f4"
integrity sha1-CZdkIPyAp6AL9AaAxjgV7Yx2FvQ=
"@types/node@^14.0.5":
version "14.0.5"
resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.0.5.tgz?cache=0&sync_timestamp=1590092201933&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
integrity sha1-PQOs07NBTPZ/r5ma7RFoLtEh8is=
"@types/prettier@^1.19.0":
version "1.19.1"
@@ -3650,6 +3650,11 @@ type-fest@^0.11.0:
resolved "https://registry.npm.taobao.org/type-fest/download/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
integrity sha1-l6vwhyMQ/tiKXEZrJWgVdhReM/E=
type-fest@^0.14.0:
version "0.14.0"
resolved "https://registry.npm.taobao.org/type-fest/download/type-fest-0.14.0.tgz#758d800f2dcc0de47a946a120d91ab17883523ad"
integrity sha1-dY2ADy3MDeR6lGoSDZGrF4g1I60=
type-fest@^0.8.1:
version "0.8.1"
resolved "https://registry.npm.taobao.org/type-fest/download/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"