thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67898 from ClickHouse/ci_mergeable_check_fix_2

Browse Source 
CI: Fix for setting Mergeable Check from sync
This commit is contained in:
Max K. 2024-08-08 08:20:01 +00:00 committed by GitHub
commit beb43734ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/jepsen.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
if: ${{ !cancelled() }}
run: |
export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
cat >> "$WORKFLOW_RESULT_FILE" << 'EOF'
cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
${{ toJson(needs) }}
EOF
python3 ./tests/ci/ci_buddy.py --check-wf-status

4
tests/ci/commit_status_helper.py
View File

@ -497,9 +497,9 @@ def trigger_mergeable_check(
description = format_description(description)
if set_from_sync:
# update Mergeable Check from sync WF only if its status already present or its new status is not SUCCESS
# update Mergeable Check from sync WF only if its status already present or its new status is FAILURE
# to avoid false-positives
if mergeable_status or state != SUCCESS:
if mergeable_status or state == FAILURE:
set_mergeable_check(commit, description, state)
elif mergeable_status is None or mergeable_status.description != description:
set_mergeable_check(commit, description, state)