From e2cae8b87843e40895760c340e606bdb7a824872 Mon Sep 17 00:00:00 2001
From: Julien Reichardt <git@jrei.ch>
Date: Sat, 22 Oct 2022 00:58:00 +0200
Subject: [PATCH] Merge PRs in the update workflow

---
 .github/workflows/merge.yml  | 22 ----------------------
 .github/workflows/update.yml |  4 ++++
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/merge.yml

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
deleted file mode 100644
index b4209ad..0000000
--- a/.github/workflows/merge.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Merge any pull request
-on:
-  schedule: # for scheduling to work this file must be in the default branch
-  - cron: "0 1 * * *" # Every day at 01:00
-  workflow_dispatch: # can be manually dispatched under GitHub's "Actions" tab
-
-jobs:
-  flatpak-external-data-checker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
-        env:
-          GIT_AUTHOR_NAME: Flatpak External Data Checker
-          GIT_COMMITTER_NAME: Flatpak External Data Checker
-          # email sets "github-actions[bot]" as commit author, see https://github.community/t/github-actions-bot-email-address/17204/6
-          GIT_AUTHOR_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-          GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-          EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: --edit-only net.rpcs3.RPCS3.yaml
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 6a73cb4..61da556 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -2,6 +2,7 @@ name: Check for updates
 on:
   schedule: # for scheduling to work this file must be in the default branch
   - cron: "30 0 * * *" # Every day at 00:30
+  - cron: "30 1 * * *" # merge the next hour
   workflow_dispatch: # can be manually dispatched under GitHub's "Actions" tab
 
 jobs:
@@ -9,6 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Prevent the retrieval of newer commits
+        if: github.event.schedule == "30 1 * * *"
+        run: sed -i '/^        branch: master/d' net.rpcs3.RPCS3.yaml
       - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
         env:
           GIT_AUTHOR_NAME: Flatpak External Data Checker