add auto merge

add auto merge

add some logging

fix: lint

.eslintrc.json

@@ -8,6 +8,7 @@
       "project": "./tsconfig.json"
     },
     "rules": {
+      "no-console": "off",
       "i18n-text/no-en": "off",
       "eslint-comments/no-use": "off",
       "import/no-namespace": "off",

action.yml

@@ -24,6 +24,8 @@ inputs:
     required: false
     description: "The base branch"
     default: "main"
+  auto_merge:
+    description: "Whether the pull request should be automatically merged"
 runs:
   using: 'node16'
   main: 'dist/index.js'

src/config.ts

@@ -7,6 +7,7 @@ const image = core.getInput('image')
 const tag = core.getInput('tag')
 const PAT = core.getInput('PAT')
 const base = core.getInput('base') || 'main'
+const auto_merge = core.getBooleanInput('auto_merge')
 
 export type IConfig = {
   base: string
@@ -21,6 +22,9 @@ export type IConfig = {
   repoDirectory: string
   repoUrl: string
   tag: string
+  git_name?: string
+  git_email?: string
+  auto_merge?: boolean
 }
 
 export function getConfig(): IConfig {
@@ -46,6 +50,7 @@ export function getConfig(): IConfig {
     repo,
     repoDirectory,
     repoUrl: `https://bot:${PAT}@github.com/${owner}/${repo}.git`,
-    tag
+    tag,
+    auto_merge
   }
 }

src/main.ts

@@ -61,28 +61,63 @@ async function run(): Promise<void> {
   try {
     shell.config.fatal = true
 
+    console.log('Configuring Git')
     shell.exec(`git config --global user.name "${config.owner}"`)
-    //shell.exec(`git config --global user.email "${config.owner}"`)
+    shell.exec(`git config --global user.email "robot@example.com"`)
+
     shell.mkdir('-p', config.clonePath)
     shell.cd(config.clonePath)
+
+    console.log('Cloning Repository')
     shell.exec(`git clone ${config.repoUrl}`)
     shell.cd(config.repoDirectory)
+    if (config.git_name) {
+      shell.exec(`git config user.name "${config.git_name}"`)
+    }
+    if (config.git_email) {
+      shell.exec(`git config user.email "${config.git_email}"`)
+    }
+
+    console.log('Creating Branch')
     shell.exec(`git checkout -B ${config.branch}`)
+
+    console.log('Bump Version')
     await bumpVersions(config)
+
+    console.log('Committing Changes')
     shell.exec(`git add .`)
     shell.exec(`git commit -m "${config.commitMsg}"`)
     shell.exec(`git push -u origin ${config.branch}`)
 
-    await github.getOctokit(config.PAT).rest.pulls.create({
+    console.log('Creating Pull Request')
+    const resp = await github.getOctokit(config.PAT).rest.pulls.create({
       owner: config.owner,
       repo: config.repo,
       title: config.commitMsg,
       head: config.branch,
       base: config.base
     })
+
+    console.log('Pull Request Created')
+    console.log(resp.data)
+
+    if (String(config.auto_merge) === 'true') {
+      console.log('Auto Merge is configured')
+      const mergeResponse = await github
+        .getOctokit(config.PAT)
+        .rest.pulls.merge({
+          owner: config.owner,
+          repo: config.repo,
+          pull_number: resp.data.number,
+          merge_method: 'squash'
+        })
+      console.log('Merge Response')
+      console.log(mergeResponse.data)
+    }
   } catch (e) {
     if (e instanceof Error) core.setFailed(e.message)
   }
+  console.log('Cleanup')
   shell.rm('-rf', config.clonePath)
 }