Automerge bot / GH-action (#144)

gfoidl · Mar 24, 2020 · a7540ea · a7540ea
1 parent 9e43ddc
commit a7540ea
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 19 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,8 +1,8 @@
-# Description
+## Description
 
-Describe the changes this PR does (and why, link to issue, if any).  
+Describe the changes this PR does (and why, link to issue, if any).	 
 If alternative solutions are evaluated, discuss them briefly.
 
-# Benchmarks
+## Benchmarks
 
 Show your benchmark results.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,37 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+
+  pull_request_review:
+    types:
+      - submitted
+
+  check_suite: 
+    types:
+      - completed
+
+  status: {}
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.8.0"
+        #with:
+        #  args: "--trace"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: "automerge"
+          #MERGE_REMOVE_LABELS:  "automerge"        # https://github.com/pascalgn/automerge-action/issues/56
+          MERGE_METHOD: "squash"
+          MERGE_DELETE_BRANCH: "true"
diff --git a/gfoidl.Base64.sln b/gfoidl.Base64.sln
@@ -89,9 +89,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6920
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gfoidl.Base64.WebDemo", "demo\gfoidl.Base64.WebDemo\gfoidl.Base64.WebDemo.csproj", "{66E1E4B6-BD9B-40FF-85A9-070B0D497E59}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{8C82D040-527E-4C94-A76D-78C4FCB158C2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{BD59807B-C788-497A-9E78-BFD789BB7639}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F8CF9ED3-55C6-4C71-87B1-2BF860B1A9C9}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml
+		.github\workflows\automerge.yml = .github\workflows\automerge.yml
 	EndProjectSection
 EndProject
 Global
@@ -149,7 +151,8 @@ Global
 		{3F0FD9C1-1B52-4BC6-9BD8-8FD3B0162E88} = {CD033330-6EDE-4E8E-976C-5CB7C58217E8}
 		{692006B6-CD1B-4A91-97C5-0A98C25EAD23} = {89ADD037-F9FC-4ADE-99B8-D89307057409}
 		{66E1E4B6-BD9B-40FF-85A9-070B0D497E59} = {A52BCD9C-4216-42E5-AB37-FD5F6C46A9E7}
-		{8C82D040-527E-4C94-A76D-78C4FCB158C2} = {CD033330-6EDE-4E8E-976C-5CB7C58217E8}
+		{BD59807B-C788-497A-9E78-BFD789BB7639} = {E4259BCE-EA4C-434C-8896-CEBBEC38222D}
+		{F8CF9ED3-55C6-4C71-87B1-2BF860B1A9C9} = {BD59807B-C788-497A-9E78-BFD789BB7639}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A902DC31-2F3E-4397-93D1-5004F325B71C}