From c9b8a237799be59ed4c04e4925ebef71cac9bf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Oct 2023 11:19:02 +0200 Subject: [PATCH 1/2] ci macOS: update Knot DNS --- .github/workflows/macOS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macOS.yaml b/.github/workflows/macOS.yaml index 821ee56a1..c99706455 100644 --- a/.github/workflows/macOS.yaml +++ b/.github/workflows/macOS.yaml @@ -8,7 +8,7 @@ jobs: runs-on: macOS-latest strategy: matrix: - knot-version: ['3.1', '3.2'] + knot-version: ['3.2', '3.3'] steps: - name: Checkout resolver code From 50eb5ca4871a6088fcf4b2c0ae2cceec26a28493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Oct 2023 11:26:48 +0200 Subject: [PATCH 2/2] ci macOS: wait on *both* builds At least I hope this will work as expected. --- ci/gh_actions.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/gh_actions.py b/ci/gh_actions.py index 8fe05b688..bbeb3b344 100755 --- a/ci/gh_actions.py +++ b/ci/gh_actions.py @@ -30,10 +30,11 @@ def exit(msg='', html_url='', code=1): elif response.status_code == 200: data = json.loads(response.content.decode('utf-8')) try: - run = data['workflow_runs'][0] - conclusion = run['conclusion'] - html_url = run['html_url'] - commit_sha = run['head_sha'] + for i in range(0, 1): # two runs ATM + run = data['workflow_runs'][i] + conclusion = run['conclusion'] + html_url = run['html_url'] + commit_sha = run['head_sha'] except (KeyError, IndexError): time.sleep(POLL_DELAY) continue