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 release/4.52 into trunk #1645

Merged
merged 10 commits into from
Sep 1, 2024
Merged

Merge release/4.52 into trunk #1645

merged 10 commits into from
Sep 1, 2024

Conversation

mokagio
Copy link
Contributor

@mokagio mokagio commented Aug 30, 2024

Merging release/4.52 into trunk.

Via intermediate branch merge/release-4.52-into-trunk, to help fix conflicts if any:

                            release/4.52  ----o-- - - -
                                               \
           merge/release-4.52-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@Automattic/apps-infrastructure this PR includes automation chances that I ported from WooCommerce iOS (see also woocommerce/woocommerce-ios#13793) as part of the ongoing release automation modernization for Simplenote (see also internal ref paaHJt-6Zx-p2). I'd appreciate a look, even though the fact that everything worked is already good proof of the validity of the changes. Thanks!

If no one gets to it before the time to start the next code freeze, I'll admin merge it.

@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

fastlane/Fastfile Outdated Show resolved Hide resolved
Comment on lines -181 to -184

lane :lint_localizations do
ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
end
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Don't know how this ended up inside a method 😳

Copy link
Contributor

Choose a reason for hiding this comment

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

Ooof. Nice catch.

Probably bad indentation at some point in the past tricked us, and then we ran rubocop -A at some point later but didn't notice it despite being more obvious once indentation was fixed? 🤷

@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Aug 30, 2024

Simplenote Prototype Build📲 You can test the changes from this Pull Request in Simplenote Prototype Build by scanning the QR code below to install the corresponding build.
App NameSimplenote Prototype Build Simplenote Prototype Build
Build Numberpr1645-15b4408-0191a32c-bfb3-4749-b9d5-a494d318a1aa
Version4.52
Bundle IDcom.codality.NotationalFlow.Alpha
Commit15b4408
App Center BuildSimplenote - Installable Builds #337
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@mokagio mokagio requested a review from a team August 30, 2024 01:56
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.

Changes in Fastfile LGTM 👍

Comment on lines -181 to -184

lane :lint_localizations do
ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
end
Copy link
Contributor

Choose a reason for hiding this comment

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

Ooof. Nice catch.

Probably bad indentation at some point in the past tricked us, and then we ran rubocop -A at some point later but didn't notice it despite being more obvious once indentation was fixed? 🤷

@mokagio mokagio merged commit f19d2d5 into trunk Sep 1, 2024
10 checks passed
@mokagio mokagio deleted the merge/release-4.52-into-trunk branch September 1, 2024 23:48
@mokagio mokagio restored the merge/release-4.52-into-trunk branch September 1, 2024 23:48
@mokagio mokagio deleted the merge/release-4.52-into-trunk branch September 1, 2024 23:48
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.

4 participants