chore: fix mess made by merge
This commit is contained in:
File diff suppressed because one or more lines are too long
10
package-lock.json
generated
10
package-lock.json
generated
@@ -1908,6 +1908,16 @@
|
|||||||
"integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
|
"integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"yamljs": {
|
||||||
|
"version": "0.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
|
||||||
|
"integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"argparse": "^1.0.7",
|
||||||
|
"glob": "^7.0.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"yargs": {
|
"yargs": {
|
||||||
"version": "15.4.1",
|
"version": "15.4.1",
|
||||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
|
||||||
|
|||||||
29
src/main.ts
29
src/main.ts
@@ -12,19 +12,6 @@ import simpleGit, { Response } from 'simple-git'
|
|||||||
import YAML from 'js-yaml'
|
import YAML from 'js-yaml'
|
||||||
import { getInput, Input, log, outputs, parseBool, setOutput } from './util'
|
import { getInput, Input, log, outputs, parseBool, setOutput } from './util'
|
||||||
|
|
||||||
type Input =
|
|
||||||
| 'add'
|
|
||||||
| 'author_name'
|
|
||||||
| 'author_email'
|
|
||||||
| 'branch'
|
|
||||||
| 'cwd'
|
|
||||||
| 'message'
|
|
||||||
| 'pull_strategy'
|
|
||||||
| 'push'
|
|
||||||
| 'remove'
|
|
||||||
| 'signoff'
|
|
||||||
| 'tag'
|
|
||||||
|
|
||||||
const baseDir = path.join(process.cwd(), getInput('cwd') || '')
|
const baseDir = path.join(process.cwd(), getInput('cwd') || '')
|
||||||
const git = simpleGit({ baseDir })
|
const git = simpleGit({ baseDir })
|
||||||
console.log(`Running in ${baseDir}`)
|
console.log(`Running in ${baseDir}`)
|
||||||
@@ -326,22 +313,6 @@ async function checkInputs() {
|
|||||||
// #endregion
|
// #endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
function getInput(name: Input) {
|
|
||||||
return getInputCore(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseBool(value: any) {
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(value)
|
|
||||||
if (typeof parsed == 'boolean') return parsed
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
function log(err: any | Error, data?: any) {
|
|
||||||
if (data) console.log(data)
|
|
||||||
if (err) error(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function add({ logWarning = true, ignoreErrors = false } = {}): Promise<
|
async function add({ logWarning = true, ignoreErrors = false } = {}): Promise<
|
||||||
(void | Response<void>)[]
|
(void | Response<void>)[]
|
||||||
> {
|
> {
|
||||||
|
|||||||
Reference in New Issue
Block a user