From 71c82a607c6029f226e62aa6b435c57c73f2d20e Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Wed, 17 Apr 2024 19:07:41 -0500 Subject: [PATCH] Fix build notification error & ignore other errors --- ci_scripts/ci_post_clone.sh | 2 +- ci_scripts/ci_post_xcodebuild.sh | 4 ++-- ci_scripts/send_build_notification.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 6e434619bc..0d5257bc09 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -2,7 +2,7 @@ set -eux -./send_build_notification.py started +./send_build_notification.py started || : cd .. make dependencies diff --git a/ci_scripts/ci_post_xcodebuild.sh b/ci_scripts/ci_post_xcodebuild.sh index dce57b4ac6..a4c82e884d 100755 --- a/ci_scripts/ci_post_xcodebuild.sh +++ b/ci_scripts/ci_post_xcodebuild.sh @@ -3,7 +3,7 @@ set -eux if [ "${CI_XCODEBUILD_EXIT_CODE:-0}" = 0 ]; then - ./send_build_notification.py finished + ./send_build_notification.py finished || : else - ./send_build_notification.py failed + ./send_build_notification.py failed || : fi diff --git a/ci_scripts/send_build_notification.py b/ci_scripts/send_build_notification.py index 6475011f87..dc76d97051 100755 --- a/ci_scripts/send_build_notification.py +++ b/ci_scripts/send_build_notification.py @@ -50,16 +50,16 @@ def main(ns): source = env["NOTIFY_SOURCE"] destination = env["NOTIFY_DESTINATION"] - branch = env["CI_BRANCH"] build_number = env["CI_BUILD_NUMBER"] build_url = env["CI_BUILD_URL"] prefix = EVENT_PREFIXES[ns.event] + ref = env["CI_GIT_REF"] trigger = env["CI_START_CONDITION"] version = get_marketing_version() message = ( - f"{prefix} {workflow} for {version} ({build_number}) {ns.event} " - f"from {branch} (trigger: {trigger})\n\n{build_url}" + f"{prefix} Cloud build for {version} ({build_number}) {ns.event} " + f"from {ref} (trigger: {trigger})\n\n{build_url}" ) args = ["curl", "--silent"] args.extend(["-H", "Content-Type: application/json"])