From 8532e172433ba7d3501cd17352946e6e5c4b9d21 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 29 Jan 2023 19:19:24 -0500 Subject: [PATCH] ci: Abort on failure to query Github's API This raises an exception if the GET request to Github's API returns anything other than 200 OK, ensuring we always have successful merges of tagged PRs. Also, reduces the number of queried pages from 29 to 9 to reduce the number of requests. --- .ci/scripts/merge/apply-patches-by-label.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index 8ddc8ff34f..3c5952aa19 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -20,6 +20,7 @@ def check_individual(labels): def do_page(page): url = 'https://api.github.com/repos/yuzu-emu/yuzu/pulls?page=%s' % page response = requests.get(url) + response.raise_for_status() if (response.ok): j = json.loads(response.content) if j == []: @@ -33,7 +34,7 @@ def do_page(page): print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) try: - for i in range(1,30): + for i in range(1,10): do_page(i) except: traceback.print_exc(file=sys.stdout)