[#1] git variant needs validations

pinpoint-apm · Nov 9, 2021 · b301c79 · b301c79
1 parent 350f166
commit b301c79
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/actions/markdown-template-engine-action/index.js b/.github/actions/markdown-template-engine-action/index.js
@@ -28,15 +28,15 @@ const run = async () => {
     const templateMarkdownFile = core.getInput('template_markdown_file')
     const template = await fs.readFile(templateMarkdownFile, 'utf8')
 
-    const version = ReleaseNotes.makeOfMarkdownContents(template).getVersionWithV()
-    const disableBranch = core.getInput('disable_branch')
-    if (version && disableBranch.length == 0) {
-      await git.branch([version])
-      await git.push('origin', version)
-    }
-
     let githubRelease = await GithubRelease.make()
-    if (!githubRelease) {
+    if (githubRelease) {
+      const version = ReleaseNotes.makeOfMarkdownContents(template).getVersionWithV()
+      const disableBranch = core.getInput('disable_branch')
+      if (version && githubRelease.needsBranch(version) && disableBranch.length == 0) {
+        await git.branch([version])
+        await git.push('origin', version)
+      }
+    } else {
       githubRelease = await GithubRelease.makeByLatestGithubReleaseNotes()
     }
     let engine = new TemplateEngine(template)

diff --git a/.github/actions/markdown-template-engine-action/lib/github-release.js b/.github/actions/markdown-template-engine-action/lib/github-release.js
@@ -17,6 +17,9 @@ class GithubRelease {
 
     static async make() {
         const payload = github.context.payload['client_payload']
+        if (!payload) {
+            return
+        }
         const { data } = await axios.get(`https://api.github.com/users/${payload.username}`)
         return new GithubRelease(payload, { name: data.name, email: `${payload.username}@users.noreply.github.com` })
     }
@@ -43,6 +46,7 @@ class GithubRelease {
         this.author = author
         this.tagName = payload.release.tag_name
         this.htmlURL = payload.release.html_url
+        this.version = ReleaseNotes.tagName(payload.release.tag_name)
     }
 
     getName() {
@@ -68,6 +72,14 @@ class GithubRelease {
     getTagName() {
         return this.tagName
     }
+
+    getVersion() {
+        return `v${this.version}`
+    }
+
+    needsBranch(other) {
+        return this.getVersion() !== other
+    }
 }
 
 module.exports = GithubRelease