search

Automattic / Automattic-Tracks-iOS

Client library for tracking user events for later analysis
GNU General Public License v2.0
41 stars 12 forks source link

Merge 0.10.0, 0.10.1, and 0.11.0 into `trunk` #195

Closed mokagio closed 2 years ago

mokagio commented 2 years ago

I presume we'll soon delete trunk and rename develop into trunk, but if I recall correctly, we want to have everything in sync and up-to-date before doing so.

I don't know why the macOS tests are failing on CircleCI. I've decided to file it as a CircleCI issue and not spend more time on it because we'll remove CircleCI in favor of Buildkite soon™

oguzkocer commented 2 years ago

(I think Oguz would have re-sync'd the trunk branch with develop before doing the migration on this repo anyway, but no harm in doing that sync now too here 🙃 )

For the develop -> trunk migration, instead of syncing current develop with current trunk, we verify that there isn't anything in trunk that's not in develop, delete trunk and then rename develop to trunk which is easier and safer. (the PR base branches, branch protection rules etc will be automatically updated this way) So, this PR didn't make a practical difference, but I think it still has historical significance as it followed our practice before the transition.

Nevertheless, I've removed trunk and renamed develop to trunk now, so this step shouldn't be necessary anymore.