From 671d9733f7c4eb2eab123b42723a42b0c10030ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl>
Date: Tue, 16 Feb 2021 18:43:23 +0100
Subject: [PATCH] ci: Use ghcr.io/flathub/actions/merge Docker image

---
 .github/workflows/merge.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 382abe9..7c6c407 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -1,13 +1,16 @@
+name: Automatic application merge
+
 on: 
   issue_comment:
-    types: [created]
-name: Automatic application merge
+    types:
+      - created
+
 jobs:
   merge:
-    name: Merge
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub/actions/merge:latest
     steps:
-    - name: Merge application
-      uses: flathub/actions/merge@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.FLATHUBBOT_TOKEN }}
+      - run: /entrypoint.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.FLATHUBBOT_TOKEN }}