Commit55c4dcb

committed

cherry-pick init commits

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent40a57fb commit55c4dcbCopy full SHA for 55c4dcb

File tree

+39

-1

lines changed

+39

-1

lines changed

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+import{execascpExec}from"child_process";`
	`2`	`+import{promisify}from"util";`
	`3`	`+`
	`4`	`+constasyncExec=promisify(cpExec);`
	`5`	`+`
	`6`	`+exportconstexec=(`
	`7`	`+command:string,`
	`8`	`+cwd:string`
	`9`	`+):Promise<{stdout:string;stderr:string}>\|never=>{`
	`10`	`+returnasyncExec(command,{ cwd});`
	`11`	`+};`
	`12`	`+`
	`13`	`+exportfunctiongitPCherryPick(cwd:string){`
	`14`	`+returnasyncfunctioncherryPick(commits:string[]):Promise<void>{`
	`15`	`+for(constcommitofcommits){`
	`16`	`+try{`
	`17`	`+const{ stdout}=awaitexec(`
	`18`	+`git cherry-pick -X theirs${commit}`,
	`19`	`+cwd`
	`20`	`+);`
	`21`	`+if(!stdout){`
	`22`	+console.warn(`No cherry-pick output for${commit}`);
	`23`	`+}`
	`24`	`+}catch(e){`
	`25`	+console.warn(`Cherry-pick failed for${commit}`);
	`26`	`+}`
	`27`	`+}`
	`28`	`+};`
	`29`	`+}`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import * as fs from "fs-extra";`
`3`	`3`	`import*asyamlParserfrom"js-yaml";`
`4`	`4`	`import{getArg}from"./utils/args";`
`5`	`5`	`importgitP,{SimpleGit}from"simple-git/promise";`
	`6`	`+import{gitPCherryPick}from"./utils/cherryPick";`
`6`	`7`	`import{getCommits,CommitLogObject}from"./utils/commits";`
`7`	`8`
`8`	`9`	`asyncfunctionvalidate(args:string[]){`
`@@ -46,10 +47,18 @@ async function validate(args: string[]) {`
`46`	`47`	`awaitfs.emptyDir(tmpDir);`
`47`	`48`	`}`
`48`	`49`	`consttempGit:SimpleGit=gitP(tmpDir);`
	`50`	`+`
	`51`	`+console.log(Object.keys(gitP));`
	`52`	`+`
`49`	`53`	`awaittempGit.init();`
	`54`	`+awaittempGit.addRemote("origin",skeleton.config.repo.uri);`
	`55`	`+awaittempGit.fetch("origin",skeleton.config.repo.branch);`
	`56`	`+// no js cherry pick implementation`
	`57`	`+constcherryPick=gitPCherryPick(tmpDir);`
`50`	`58`
`51`	`59`	`// VALIDATE TUTORIAL TESTS`
`52`	`60`	`if(commits.INIT){`
	`61`	`+cherryPick(commits.INIT);`
`53`	`62`	`}`
`54`	`63`
`55`	`64`	`// run test runner setup command(s)`
`@@ -71,7 +80,7 @@ async function validate(args: string[]) {`
`71`	`80`	`console.error(e.message);`
`72`	`81`	`}finally{`
`73`	`82`	`// cleanup`
`74`		`-awaitfs.emptyDir(tmpDir);`
	`83`	`+//await fs.emptyDir(tmpDir);`
`75`	`84`	`}`
`76`	`85`	`}`
`77`	`86`

Comments

(0)