diff --git a/.github/workflows/uncivbot.yml b/.github/workflows/uncivbot.yml index 7c9f21ba6e..67c39ca37c 100644 --- a/.github/workflows/uncivbot.yml +++ b/.github/workflows/uncivbot.yml @@ -15,27 +15,27 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, per_page: 50 }); - //var commitSummary = ""; - //var ownerToCommits = {} - //var reachedPreviousVersion = false - //result.data.forEach(commit => { - // if(reachedPreviousVersion) return - // var author = commit.author.login - // if(author=="uncivbot[bot]") return - // var commitMessage = commit.commit.message.split("\n")[0]; - // if(commitMessage.match(/^\d+\.\d+\.\d+$/)){ // match EXACT version, like 3.4.55 ^ is for start-of-line, $ for end-of-line - // reachedPreviousVersion=true - // console.log(commitMessage) - // return - // } - // if(commitMessage.startsWith("Merge ")) return - // commitMessage = commitMessage.replace(/\(\#\d+\)/,"") // match PR auto-text, like (#2345) - // if (author != owner){ - // if (ownerToCommits.get(author)==undefined) ownerToCommits.set(author,[]) - // ownerToCommits.get(author)?.push(commitMessage) - // } - // else commitSummary += "\n\n" + commitMessage - //}); + var commitSummary = ""; + var ownerToCommits = {} + var reachedPreviousVersion = false + result.data.forEach(commit => { + if(reachedPreviousVersion) return + var author = commit.author.login + if(author=="uncivbot[bot]") return + var commitMessage = commit.commit.message.split("\n")[0]; + if(commitMessage.match(/^\d+\.\d+\.\d+$/)){ // match EXACT version, like 3.4.55 ^ is for start-of-line, $ for end-of-line + reachedPreviousVersion=true + console.log(commitMessage) + return + } + if(commitMessage.startsWith("Merge ")) return + commitMessage = commitMessage.replace(/\(\#\d+\)/,"") // match PR auto-text, like (#2345) + if (author != owner){ + if (ownerToCommits.get(author)==undefined) ownerToCommits.set(author,[]) + ownerToCommits.get(author)?.push(commitMessage) + } + else commitSummary += "\n\n" + commitMessage + }); //ownerToCommits.forEach((commits,author)=>{ // commitSummary += "\n\nBy "+author+":" // commits.forEach(commitMessage => {commitSummary+="\n- "+commitMessage}) @@ -45,5 +45,5 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: toJson(result) + body: commitSummary })