From d42954064447bb00a333ed57c60cc78f08cb0efd Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Sun, 24 May 2020 18:25:06 +0200
Subject: [PATCH 1/4] Bump shell-linter action to v0.4.0

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 96be3ec..892d913 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: shellcheck
-        uses: azohra/shell-linter@v0.2.0
+        uses: azohra/shell-linter@v0.4.0
 
       - name: hadolint
         uses: brpaz/hadolint-action@master

From 165a8beeca996914a8ed28649ab958c13035d096 Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Sun, 24 May 2020 18:27:44 +0200
Subject: [PATCH 2/4] Add automerge github action

---
 .github/workflows/automerge.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 0000000..42c77f4
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,30 @@
+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@0.8.3"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_RETRIES: 30
+          MERGE_RETRY_SLEEP: 10000
+          MERGE_METHOD: merge

From 08c37464d737830d3c631d88dd7b2ee50333593e Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Sun, 24 May 2020 18:28:47 +0200
Subject: [PATCH 3/4] Bump postfix version to 3.4.12

---
 conf.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.env b/conf.env
index abbd72b..5be1b51 100644
--- a/conf.env
+++ b/conf.env
@@ -1,2 +1,2 @@
-POSTFIX_VERSION=3.4.9-r0
+POSTFIX_VERSION=3.4.12-r0
 DOCKER_IMAGE=dcarrillo/postfix

From 4ea97f54141c7cc20387e5432af3357959cbb55b Mon Sep 17 00:00:00 2001
From: dcarrillo <daniel.carrillo@gmail.com>
Date: Sun, 24 May 2020 18:32:37 +0200
Subject: [PATCH 4/4] Fix automerge version

---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 42c77f4..2cbf113 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@0.8.3"
+        uses: "pascalgn/automerge-action@7ab42e888a333bf77ce865bc84fedc6a365a3548"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_RETRIES: 30