auto merge the pr as well

hoeg · May 10, 2024 · 9244890 · 9244890
1 parent c773e32
commit 9244890
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -14,8 +14,13 @@ jobs:
         uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Approve a PR
+      - name: Approve PR
         run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Merge PR
+        run: gh pr merge "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Points to the mounted whitelist file.
 
 ### Whitelist format
 
-```
+```txt
 name1=ip1
 name2=ip2
 ...
@@ -50,8 +50,8 @@ The `deploy/` folder contains all resources to get up and running except the sec
 
 `./setup-kind` prepares a cluster where the functionality can be tested by running:
 
-```
+```bash
 kubectl apply -f deploy/admission-webhook.yaml && kubectl apply -f deploy/test/ingress-blue.yaml
 ```
 
-and then inspecting the ingress resource afterwards.
+and then inspecting the ingress resource afterwards.