From e1b91f0c84b321c6273279f6ad079637bad7bda5 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Tue, 20 Feb 2024 10:24:01 -0500 Subject: [PATCH 1/3] ci(sync): add labels for synching pull requests --- .github/workflows/repo-files-sync.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/repo-files-sync.yml b/.github/workflows/repo-files-sync.yml index e289645..1978b2a 100644 --- a/.github/workflows/repo-files-sync.yml +++ b/.github/workflows/repo-files-sync.yml @@ -46,3 +46,5 @@ jobs: with: GH_PAT: ${{ secrets.REPO_SYNC_PAT }} COMMIT_EACH_FILE: false # Commit all files at once + PR_LABELS: | + file-sync From 04d9655b56c6149320933f24187942edf835744a Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Tue, 20 Feb 2024 10:24:32 -0500 Subject: [PATCH 2/3] ci(mergify): also enqueue file sync pull requests --- .github/mergify.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index cb2772e..a691cee 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -13,7 +13,9 @@ pull_request_rules: - name: Automatic merge from renovate conditions: - check-success=Good to merge - - author=renovate[bot] + - or: + - author=renovate[bot] + - label=file-sync actions: queue: name: deps-update From 414ae772fc1245daac2452d7f71ed5655f7fd9a2 Mon Sep 17 00:00:00 2001 From: Marcos Pereira Date: Tue, 20 Feb 2024 10:25:09 -0500 Subject: [PATCH 3/3] ci(mergify): wait longer to merge enqueued pull requests --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index a691cee..3f83579 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -6,7 +6,7 @@ queue_rules: conditions: - check-success=Good to merge batch_size: 10 - batch_max_wait_time: 15min + batch_max_wait_time: 90min merge_method: rebase pull_request_rules: