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.4 back into develop #2378

Merged
merged 19 commits into from
Jun 4, 2020
Merged

Merge Release/4.4 back into develop #2378

merged 19 commits into from
Jun 4, 2020

Conversation

loremattei
Copy link
Contributor

Merge Release/4.4 back into develop

Update release notes:

  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@loremattei loremattei added the category: releases For PRs that merge a `release/*` branch into `develop` or `trunk`. label Jun 3, 2020
@peril-woocommerce
Copy link

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

Generated by 🚫 dangerJS

@oguzkocer
Copy link
Contributor

@jaclync @shiki @pmusolino Could you take a look at the failing CI build? I assume this is related to #2366, that's why I am pinging you 3, I hope that's correct 🤞

❌  /Users/distiller/project/Yosemite/YosemiteTests/Storage/StorageManagerConcurrencyTests.swift:66:61: missing argument for parameter 'crashLogger' in call
        storageManager = CoreDataManager(name: "WooCommerce")

@pmusolino
Copy link
Member

@oguzkocer on it. Can I open a new PR on release/4.4 branch?

@oguzkocer
Copy link
Contributor

@oguzkocer on it. Can I open a new PR on release/4.4 branch?

Thank you @pmusolino! yes please, but maybe get the PR approved but leave the merge to @loremattei just in case, since he is the release manager.

@loremattei I assume this is fine to do because it'll be fixing the tests and won't necessarily need us to publish a new beta. Also, if we don't fix it in the release branch, we'll have the issue in the later PRs as well. If you disagree, we can just change the base branch for the PR, so we should be safe regardless 🤞

@pmusolino
Copy link
Member

Here it is: #2380

@loremattei
Copy link
Contributor Author

loremattei commented Jun 4, 2020

Thanks @oguzkocer! It totally makes sense!

@peril-woocommerce
Copy link

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

@oguzkocer oguzkocer merged commit 1ccefd8 into develop Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: releases For PRs that merge a `release/*` branch into `develop` or `trunk`.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants