Merge #4089 Use checkout action for notify workflow

.github/workflows/deploy.yml

@@ -189,6 +189,8 @@ jobs:
 
   notify-discord:
     needs:
+      - test-release
+      - smoke-inflator
       - upload-deb
       - upload-rpm
       - upload-inflator

.github/workflows/notify.yml

@@ -17,10 +17,13 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: DiscordHooks/github-actions-discord-webhook
+          path: webhook
+          fetch-depth: 1
       - env:
           WORKFLOW_NAME: ${{ inputs.name }}
           HOOK_OS_NAME: ${{ runner.os }}
         shell: bash
-        run: |
-          git clone --depth 1 https://github.com/DiscordHooks/github-actions-discord-webhook.git webhook
-          bash webhook/send.sh ${{ inputs.success && 'success' || 'failure' }} ${{ secrets.DISCORD_WEBHOOK }}
+        run: bash webhook/send.sh ${{ inputs.success && 'success' || 'failure' }} ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release.yml

@@ -182,6 +182,8 @@ jobs:
 
   notify-discord:
     needs:
+      - test-release
+      - smoke-inflator
       - build-dmg
       - build-deb
       - build-rpm

CHANGELOG.md

@@ -48,7 +48,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Build nuget package, support netstandard2.0 build (#4039 by: HebaruSan)
 - [Core] Use fully sanitized archive.org bucket names (#4043 by: HebaruSan)
 - [Netkan] Omit duplicate inflation warnings in queue (#4071 by: HebaruSan)
-- [Build] Refactor + Modernise Actions (#4082, #4088 by: techman83, HebaruSan; reviewed: HebaruSan)
+- [Build] Refactor + Modernise Actions (#4082, #4088, #4089 by: techman83, HebaruSan; reviewed: HebaruSan)
 
 ## v1.34.4 (Niven)
 

bin/ckan_merge_pr.py

@@ -153,6 +153,14 @@ def merge_into(self, repo: CkanRepo, self_review: bool) -> bool:
         if not branch:
             print(f'PR #{self.pull_request.number} commit {self.pull_request.head.sha} not found!')
             return False
+        pr_commits = self.pull_request.get_commits()
+        incomplete_checks = [run
+                             for run in pr_commits[pr_commits.totalCount - 1].get_check_runs()
+                             if run.status != 'completed'
+                                or run.conclusion not in ('success', 'skipped')]
+        if incomplete_checks:
+            print('Incomplete checks:', ', '.join(ch.name for ch in incomplete_checks))
+            return False
         # Valid; do it!
         # repo.index.merge_tree doesn't auto resolve conflicts
         repo.git.merge(branch, no_commit=True, no_ff=True)