Merge branch 'main' into gio/gh-refresh-token

VERSION

@@ -1 +1 @@
-23.7.27
+23.9.5

services/notification/notifiers/mixins/message/__init__.py

@@ -168,7 +168,7 @@ async def _possibly_write_gh_app_login_announcement(
             and not owner.integration_id
             and not is_enterprise()
         ):
-            message_to_display = "Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/)."
+            message_to_display = "Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality."
             write(f":exclamation: {message_to_display}")
             write("")
 

services/notification/notifiers/tests/integration/test_comment.py

@@ -344,7 +344,7 @@ async def test_notify(self, sample_comparison, codecov_vcr, mock_configuration):
             "> Report is 2 commits behind head on main.",
             "> The diff coverage is `n/a`.",
             "",
-            ":exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/).",
+            ":exclamation: Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality.",
             "",
             "[![Impacted file tree graph](https://app.codecov.io/gh/joseph-sentry/codecov-demo/pull/9/graphs/tree.svg?width=650&height=150&src=pr&token=abcdefghij)](https://app.codecov.io/gh/joseph-sentry/codecov-demo/pull/9?src=pr&el=tree)",
             "",
@@ -556,7 +556,7 @@ async def test_notify_new_layout(
             "> Comparison is base [(`5b174c2`)](https://app.codecov.io/gh/joseph-sentry/codecov-demo/commit/5b174c2b40d501a70c479e91025d5109b1ad5c1b?el=desc) 50.00% compared to head [(`5601846`)](https://app.codecov.io/gh/joseph-sentry/codecov-demo/pull/9?src=pr&el=desc) 60.00%.",
             "> Report is 2 commits behind head on main.",
             "",
-            ":exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/).",
+            ":exclamation: Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality.",
             "",
             "<details><summary>Additional details and impacted files</summary>\n",
             "",
@@ -632,7 +632,7 @@ async def test_notify_with_components(
             "> Comparison is base [(`5b174c2`)](https://app.codecov.io/gh/joseph-sentry/codecov-demo/commit/5b174c2b40d501a70c479e91025d5109b1ad5c1b?el=desc) 50.00% compared to head [(`5601846`)](https://app.codecov.io/gh/joseph-sentry/codecov-demo/pull/9?src=pr&el=desc) 60.00%.",
             "> Report is 2 commits behind head on main.",
             "",
-            ":exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/).",
+            ":exclamation: Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality.",
             "",
             "<details><summary>Additional details and impacted files</summary>\n",
             "",

services/notification/notifiers/tests/unit/test_comment.py

@@ -436,7 +436,7 @@ async def test__possibly_write_gh_app_login_announcement_should_add_announcement
             fake_comparison, mock_write
         )
         mock_write.assert_any_call(
-            ":exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/).",
+            ":exclamation: Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality.",
         )
         assert mock_write.call_count == 2
 

tasks/tests/integration/test_notify_task.py

@@ -1159,7 +1159,7 @@ async def test_simple_call_status_and_notifiers(
                                 "> Report is 2 commits behind head on main.",
                                 "> The diff coverage is `n/a`.",
                                 "",
-                                ":exclamation: Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please [install the GitHub App Integration](https://github.com/apps/codecov) for your organization. [Read more](https://about.codecov.io/blog/codecov-is-updating-its-github-integration/).",
+                                ":exclamation: Your organization needs to install the [Codecov GitHub app](https://github.com/apps/codecov/installations/select_target) to enable full functionality.",
                                 "",
                                 "[![Impacted file tree graph](https://myexamplewebsite.io/gh/joseph-sentry/codecov-demo/pull/9/graphs/tree.svg?width=650&height=150&src=pr&token=abcdefghij)](https://myexamplewebsite.io/gh/joseph-sentry/codecov-demo/pull/9?src=pr&el=tree)",
                                 "",

tasks/upload_finisher.py

@@ -224,6 +224,17 @@ def should_call_notifications(
         if not any(
             x["successful"] for x in processing_results.get("processings_so_far", [])
         ):
+            log.info(
+                "Not scheduling notify because there are no successful processing results",
+                extra=dict(
+                    repoid=commit.repoid,
+                    commit=commit.commitid,
+                    commit_yaml=commit_yaml,
+                    processing_results=processing_results,
+                    report_code=report_code,
+                    parent_task=self.request.parent_id,
+                ),
+            )
             return False
 
         after_n_builds = (