Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the "Move fastlane into project root" changes into develop #15884

Merged
merged 27 commits into from
Feb 12, 2021

Conversation

jkmassel
Copy link
Contributor

Because this is a huge change, I'd like to land this in develop independent of other changes (instead of trying to sort through a beta fix with all this stuff cluttering up the PR).

It was already approved in #15706 and these changes should be identical – immediately following the PR merge, I cut this branch from release/16.7.

jkmassel and others added 27 commits January 25, 2021 15:50
Co-authored-by: Olivier Halligon <[email protected]>
# Conflicts:
#	fastlane/metadata/ar-SA/release_notes.txt
#	fastlane/metadata/de-DE/release_notes.txt
#	fastlane/metadata/default/release_notes.txt
#	fastlane/metadata/en-GB/release_notes.txt
#	fastlane/metadata/en-US/release_notes.txt
#	fastlane/metadata/es-ES/release_notes.txt
#	fastlane/metadata/es-MX/release_notes.txt
#	fastlane/metadata/fr-FR/release_notes.txt
#	fastlane/metadata/id/release_notes.txt
#	fastlane/metadata/it/release_notes.txt
#	fastlane/metadata/ja/release_notes.txt
#	fastlane/metadata/ko/release_notes.txt
#	fastlane/metadata/nl-NL/release_notes.txt
#	fastlane/metadata/ru/release_notes.txt
#	fastlane/metadata/sv/release_notes.txt
#	fastlane/metadata/tr/release_notes.txt
#	fastlane/metadata/zh-Hans/release_notes.txt
#	fastlane/metadata/zh-Hant/release_notes.txt
Co-authored-by: Olivier Halligon <[email protected]>
Co-authored-by: Olivier Halligon <[email protected]>
Co-authored-by: Olivier Halligon <[email protected]>
@jkmassel jkmassel added this to the 16.7 ❄️ milestone Feb 12, 2021
@jkmassel jkmassel requested a review from a team February 12, 2021 19:15
@jkmassel jkmassel self-assigned this Feb 12, 2021
@peril-wordpress-mobile
Copy link

You can trigger an installable build for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

Messages
📖 This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

Copy link
Contributor

@AliSoftware AliSoftware left a comment

Choose a reason for hiding this comment

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

I have to admit that I didn't review this one as in-depth as the original one, but the diff and git graph makes sense to me, so we should be good.

(I noticed that the PR re-adds the fastlane/metadata/*/release_notes.txt files needlessly, but I don't think that's a big deal so 👍 )

@jkmassel jkmassel merged commit 721542f into develop Feb 12, 2021
@jkmassel jkmassel deleted the merge/move-fastlane-into-project-root-into-develop branch February 12, 2021 19:52
dcalhoun added a commit that referenced this pull request Feb 15, 2021
These styling violations likely occurred during the relocation of
Fastlane files to the top-level directory. #15884
@dcalhoun dcalhoun mentioned this pull request Feb 15, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants