diff --git a/.github/workflows/compliance_check.yml b/.github/workflows/compliance_check.yml index c8bce3302a..4425032a44 100644 --- a/.github/workflows/compliance_check.yml +++ b/.github/workflows/compliance_check.yml @@ -52,18 +52,13 @@ jobs: - name: send_compliance_slack_notification if: always() run: | - REPORT_CONTENT="" - if [ -f "target/compliance-report.md" ]; then - REPORT_CONTENT=$(cat "target/compliance-report.md") - fi - if [ "$COMPLIANCE_OUTCOME" == "success" ]; then STATUS="✅ Scheduled compliance check passed for $COMPLIANCE_TAG" else STATUS="⚠️ Scheduled compliance check failed for $COMPLIANCE_TAG" fi - MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s\n\n%s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22" "$REPORT_CONTENT") + MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22") curl -X POST -H 'Content-type: application/json' \ --data "$(jq -n --arg text "$MESSAGE" '{"text": $text}')" \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f20f64c7a5..74cdc3f53f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -325,18 +325,13 @@ jobs: - name: send_compliance_slack_notification if: always() run: | - REPORT_CONTENT="" - if [ -f "target/compliance-report.md" ]; then - REPORT_CONTENT=$(cat "target/compliance-report.md") - fi - if [ "$COMPLIANCE_OUTCOME" == "success" ]; then STATUS="✅ Compliance check passed for $COMPLIANCE_TAG" else STATUS="❌ Compliance check failed for $COMPLIANCE_TAG" fi - MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s\n\n%s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22" "$REPORT_CONTENT") + MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22") curl -X POST -H 'Content-type: application/json' \ --data "$(jq -n --arg text "$MESSAGE" '{"text": $text}')" \ @@ -695,18 +690,13 @@ jobs: - name: send_compliance_slack_notification if: always() run: | - REPORT_CONTENT="" - if [ -f "target/compliance-report.md" ]; then - REPORT_CONTENT=$(cat "target/compliance-report.md") - fi - if [ "$COMPLIANCE_OUTCOME" == "success" ]; then STATUS="✅ Compliance check passed for $COMPLIANCE_TAG" else STATUS="❌ Compliance check failed for $COMPLIANCE_TAG" fi - MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s\n\n%s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22" "$REPORT_CONTENT") + MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s" "$STATUS" "$ARTIFACT_URL" "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22") curl -X POST -H 'Content-type: application/json' \ --data "$(jq -n --arg text "$MESSAGE" '{"text": $text}')" \ diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs index 27f78fd74c..99e8463a25 100644 --- a/tooling/xtask/src/tasks/workflows/release.rs +++ b/tooling/xtask/src/tasks/workflows/release.rs @@ -177,18 +177,13 @@ pub(crate) fn add_compliance_notification_steps( }; let script = formatdoc! {r#" - REPORT_CONTENT="" - if [ -f "{COMPLIANCE_REPORT_FILE}" ]; then - REPORT_CONTENT=$(cat "{COMPLIANCE_REPORT_FILE}") - fi - if [ "$COMPLIANCE_OUTCOME" == "success" ]; then STATUS="{success_prefix} for $COMPLIANCE_TAG" else STATUS="{failure_prefix} for $COMPLIANCE_TAG" fi - MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s\n\n%s" "$STATUS" "$ARTIFACT_URL" "{NEEDS_REVIEW_PULLS_URL}" "$REPORT_CONTENT") + MESSAGE=$(printf "%s\n\nReport: %s\nPRs needing review: %s" "$STATUS" "$ARTIFACT_URL" "{NEEDS_REVIEW_PULLS_URL}") curl -X POST -H 'Content-type: application/json' \ --data "$(jq -n --arg text "$MESSAGE" '{{"text": $text}}')" \