Skip to content

Conversation

@avivkeller
Copy link
Member

@avivkeller avivkeller commented Apr 17, 2025

Workaround for codecov/codecov-action#1733

The process goes like this:

  1. The PR is added to the merge queue, triggering the creation of a temporary gh-readonly-queue/... branch.
  2. A merge commit is generated in preparation for merging into main.
  3. Codecov uploads the status report. (This PR removes this step)
  4. The PR is merged into main.
  5. Codecov skips another status upload, as the commit status was already uploaded in Step 3 — and therefore thinks the still exists on the gh-readonly-queue/... branch.

This causes our UI (https://app.codecov.io/github/nodejs/nodejs.org) to not have any main commits showing, but plenty of gh-readonly-queue ones.

Copilot AI review requested due to automatic review settings April 17, 2025 19:54
@avivkeller avivkeller requested a review from a team as a code owner April 17, 2025 19:54
@vercel
Copy link

vercel bot commented Apr 17, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
nodejs-org ✅ Ready (Inspect) Visit Preview Apr 17, 2025 7:54pm

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR addresses an issue with the Codecov upload process from the merge queue by adding a condition to skip uploads when the event is triggered by a merge group.

  • Update the condition for uploading test coverage to Codecov
  • Update the condition for uploading test results to Codecov
Comments suppressed due to low confidence (2)

.github/workflows/lint-and-tests.yml:145

  • Verify that 'merge_group' is the correct event identifier for merge queue scenarios to ensure the condition accurately skips Codecov uploads.
if: ${{ !cancelled() && github.event_name != 'merge_group' }}

.github/workflows/lint-and-tests.yml:151

  • Confirm the updated condition is consistent with the intended behavior for test result uploads in merge queue events to prevent unintended uploads.
if: ${{ !cancelled() && github.event_name != 'merge_group' }}

@codecov-commenter
Copy link

codecov-commenter commented Apr 17, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.62%. Comparing base (c0d6b17) to head (0b819fb).
Report is 2 commits behind head on main.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7661      +/-   ##
==========================================
+ Coverage   74.61%   74.62%   +0.01%     
==========================================
  Files          96       96              
  Lines        7685     7685              
  Branches      192      192              
==========================================
+ Hits         5734     5735       +1     
+ Misses       1949     1948       -1     
  Partials        2        2              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 17, 2025

Lighthouse Results

URL Performance Accessibility Best Practices SEO Report
/en 🟢 100 🟢 100 🟢 100 🟢 91 🔗
/en/about 🟢 100 🟢 100 🟢 100 🟢 91 🔗
/en/about/previous-releases 🟢 98 🟢 100 🟢 100 🟢 92 🔗
/en/download 🟢 98 🟢 100 🟢 100 🟢 91 🔗
/en/blog 🟢 100 🟢 100 🟢 96 🟢 92 🔗

Copy link
Member

@AugustinMauroy AugustinMauroy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGMT !

@avivkeller avivkeller added the fast-track Fast Tracking PRs label Apr 17, 2025
@avivkeller avivkeller enabled auto-merge April 17, 2025 20:56
@avivkeller avivkeller added the github_actions:pull-request Trigger Pull Request Checks label Apr 17, 2025
@github-actions github-actions bot removed the github_actions:pull-request Trigger Pull Request Checks label Apr 17, 2025
@avivkeller avivkeller added this pull request to the merge queue Apr 17, 2025
Merged via the queue into main with commit 294a102 Apr 17, 2025
27 checks passed
@avivkeller avivkeller deleted the fix/codecov-merge_group branch April 17, 2025 21:05
@avivkeller
Copy link
Member Author

Now, the commits correctly show main, and our overall coverage displays.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fast-track Fast Tracking PRs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants