Skip to content

Conversation

@bengl
Copy link
Collaborator

@bengl bengl commented Jul 17, 2023

This makes the appropriate changes in CI files, readme, etc., to rename the master branch to main.

Once this is merged, the branch should immediately be renamed, which should also re-home PRs against main. GitHub provides some details on this process. Note the following from that page:

Renaming a branch will:

  • Re-target any open pull requests
  • Update any draft releases based on the branch
  • Move any branch protection rules that explicitly reference the old name
  • Update the branch used to build GitHub Pages, if applicable
  • Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository
  • Show a notice to contributors who git push to the old branch
  • Redirect web requests for the old branch name to the new branch name
  • Return a "Moved Permanently" response in API requests for the old branch name

Learn more about renaming a branch.

Local branches should be changed, after this has been merged and the branch has been renamed:

git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
git remote prune origin

@bengl bengl requested a review from a team as a code owner July 17, 2023 19:02
@github-actions
Copy link

github-actions bot commented Jul 17, 2023

Overall package size

Self size: 8.77 MB
Deduped: 94.97 MB
No deduping: 95.48 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.4.0 | 29.44 MB | 29.44 MB | | @datadog/native-appsec | 8.4.0 | 19.25 MB | 19.26 MB | | @datadog/native-iast-taint-tracking | 3.3.0 | 13.77 MB | 13.78 MB | | @datadog/pprof | 5.5.1 | 9.79 MB | 10.17 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.8.0 | 2.6 MB | 2.74 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 3.1.0 | 1.06 MB | 1.46 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 835.4 kB | | source-map | 0.7.4 | 226 kB | 226 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | lru-cache | 7.18.3 | 133.92 kB | 133.92 kB | | pprof-format | 2.1.0 | 111.69 kB | 111.69 kB | | @datadog/sketches-js | 2.1.0 | 109.9 kB | 109.9 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 5.3.2 | 53.63 kB | 53.63 kB | | shell-quote | 1.8.1 | 44.96 kB | 44.96 kB | | istanbul-lib-coverage | 3.2.0 | 29.34 kB | 29.34 kB | | rfdc | 1.3.1 | 25.21 kB | 25.21 kB | | @isaacs/ttlcache | 1.4.1 | 25.2 kB | 25.2 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | dc-polyfill | 0.1.4 | 23.1 kB | 23.1 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | semifies | 1.0.0 | 15.84 kB | 15.84 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | ttl-set | 1.0.0 | 4.61 kB | 9.69 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | koalas | 1.0.2 | 6.47 kB | 6.47 kB | | module-details-from-path | 1.0.3 | 4.47 kB | 4.47 kB |

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@codecov
Copy link

codecov bot commented Jul 17, 2023

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.94%. Comparing base (c4f2921) to head (5ff6ff8).
⚠️ Report is 936 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3407   +/-   ##
=======================================
  Coverage   80.94%   80.94%           
=======================================
  Files         488      488           
  Lines       21851    21851           
=======================================
  Hits        17688    17688           
  Misses       4163     4163           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Qard
Qard previously approved these changes Jul 17, 2023
astuyve
astuyve previously approved these changes Jul 17, 2023
Copy link
Collaborator

@astuyve astuyve left a comment

Choose a reason for hiding this comment

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

👍🏻 from Serverless

nsavoire
nsavoire previously approved these changes Jul 17, 2023
Copy link
Collaborator

@nsavoire nsavoire left a comment

Choose a reason for hiding this comment

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

LGTM for profiling !

tlhunter
tlhunter previously approved these changes Jul 17, 2023
Copy link
Member

@tlhunter tlhunter left a comment

Choose a reason for hiding this comment

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

Probably worth sharing the command that developers will need to run locally to get things square. Like, they should probably delete master, checkout main, track the remote.

szegedi
szegedi previously approved these changes Jul 18, 2023
Copy link
Contributor

@szegedi szegedi left a comment

Choose a reason for hiding this comment

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

I'm glad we're doing this!

juan-fernandez
juan-fernandez previously approved these changes Jul 18, 2023
uurien
uurien previously approved these changes Jul 18, 2023
@bengl
Copy link
Collaborator Author

bengl commented Jul 18, 2023

@tlhunter I've added that in the PR description. Since this should only need to be done once, I don't think it warrants being included elsewhere.

uurien
uurien previously approved these changes Jul 20, 2023
@Qard Qard requested review from a team as code owners June 17, 2024 23:42
duncanista
duncanista previously approved these changes Jun 17, 2024
Copy link
Contributor

@duncanista duncanista left a comment

Choose a reason for hiding this comment

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

Finally! 😈

@Qard
Copy link
Contributor

Qard commented Jun 18, 2024

Strange. Not sure where that review request came from. I guess it auto-triggered somehow when I force pushed master to fix the recent accidental merge? 🤔

@github-actions
Copy link

This pull request has been marked as stale due to 90 days of inactivity.
If this is still relevant, please update or comment to keep it open.
If this should be kept open indefinitely, please apply the label keep-open.
Otherwise, it will be automatically closed after 14 days.

@github-actions github-actions bot added the stale label Feb 21, 2025
@BridgeAR BridgeAR dismissed stale reviews from duncanista and uurien via cef02a7 February 24, 2025 20:27
@BridgeAR BridgeAR force-pushed the bengl/master-to-main branch from 23e0de6 to cef02a7 Compare February 24, 2025 20:27
@BridgeAR
Copy link
Collaborator

I just updated the PR. Please have another look

This makes the appropriate changes in CI files, readme, etc., to rename
the master branch to main.

Once this is merged, the branch should _immediately_ be renamed, which
should also re-home PRs agains main. [GitHub provides some details on
this process](https://github.com/github/renaming).

Co-authored-by: Ruben Bridgewater <[email protected]>
@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Feb 24, 2025

Datadog Report

Branch report: bengl/master-to-main
Commit report: 2155e5e
Test service: dd-trace-js-integration-tests

✅ 0 Failed, 663 Passed, 0 Skipped, 10m 31.12s Total Time

@BridgeAR BridgeAR force-pushed the bengl/master-to-main branch from cef02a7 to 5ff6ff8 Compare February 24, 2025 20:33
@pr-commenter
Copy link

pr-commenter bot commented Feb 24, 2025

Benchmarks

Benchmark execution time: 2025-02-24 20:44:43

Comparing candidate commit 5ff6ff8 in PR branch bengl/master-to-main with baseline commit c4f2921 in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 917 metrics, 16 unstable metrics.

@github-actions github-actions bot removed the stale label Feb 25, 2025
@bengl
Copy link
Collaborator Author

bengl commented May 8, 2025

Moving this to draft because it needs quite a huge rebase, or potentially a re-do.

@bengl bengl marked this pull request as draft May 8, 2025 19:58
@BridgeAR
Copy link
Collaborator

Superseded

@BridgeAR BridgeAR closed this Oct 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.