forked from woocommerce/woocommerce-android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into issue-10719/total-sheet-shipping-tax
- Loading branch information
Showing
147 changed files
with
3,803 additions
and
1,050 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,56 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| def release_branch? | ||
| danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/') | ||
| end | ||
|
|
||
| def main_branch? | ||
| danger.github.branch_for_base == 'trunk' | ||
| end | ||
| github.dismiss_out_of_range_messages | ||
|
|
||
| def wip_feature? | ||
| has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') } | ||
| has_wip_title = github.pr_title.include?('WIP') | ||
| # `files: []` forces rubocop to scan all files, not just the ones modified in the PR | ||
| rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true) | ||
|
|
||
| has_wip_label || has_wip_title | ||
| end | ||
| manifest_pr_checker.check_gemfile_lock_updated | ||
|
|
||
| return if github.pr_labels.include?('Releases') | ||
| android_release_checker.check_release_notes_and_play_store_strings | ||
|
|
||
| github.dismiss_out_of_range_messages | ||
| android_strings_checker.check_strings_do_not_refer_resource | ||
|
|
||
| manifest_pr_checker.check_gemfile_lock_updated | ||
| # skip remaining checks if we're in a release-process PR | ||
| if github.pr_labels.include?('Releases') | ||
| message('This PR has the `Releases` label: some checks will be skipped.') | ||
| return | ||
| end | ||
|
|
||
| labels_checker.check( | ||
| do_not_merge_labels: ['status: do not merge'], | ||
| required_labels: [//], | ||
| required_labels_error: 'PR requires at least one label.' | ||
| common_release_checker.check_internal_release_notes_changed(report_type: :message) | ||
|
|
||
| tracks_checker.check_tracks_changes( | ||
| tracks_files: [ | ||
| 'AnalyticsTracker.kt', | ||
| 'AnalyticsEvent.kt', | ||
| 'LoginAnalyticsTracker.kt' | ||
| ], | ||
| tracks_usage_matchers: [ | ||
| /AnalyticsTracker\.track/ | ||
| ], | ||
| tracks_label: 'category: tracks' | ||
| ) | ||
|
|
||
| view_changes_need_screenshots.view_changes_need_screenshots | ||
| view_changes_checker.check | ||
|
|
||
| pr_size_checker.check_diff_size( | ||
| file_selector: ->(path) { !path.include?('/src/test') }, | ||
| max_size: 300 | ||
| max_size: 300, | ||
| file_selector: ->(path) { !path.include?('/src/test') } | ||
| ) | ||
|
|
||
| android_unit_test_checker.check_missing_tests | ||
|
|
||
| # skip check for draft PRs and for WIP features unless the PR is against the main branch or release branch | ||
| milestone_checker.check_milestone_due_date(days_before_due: 2) unless github.pr_draft? || (wip_feature? && !(release_branch? || main_branch?)) | ||
| # skip remaining checks if the PR is still a Draft | ||
| if github.pr_draft? | ||
| message('This PR is still a Draft: some checks will be skipped.') | ||
| return | ||
| end | ||
|
|
||
| labels_checker.check( | ||
| do_not_merge_labels: ['status: do not merge'], | ||
| required_labels: [//], | ||
| required_labels_error: 'PR requires at least one label.' | ||
| ) | ||
|
|
||
| rubocop.lint(inline_comment: true, fail_on_inline_comment: true, include_cop_names: true) | ||
| # runs the milestone check if this is not a WIP feature and the PR is against the main branch or the release branch | ||
| milestone_checker.check_milestone_due_date(days_before_due: 2) if (github_utils.main_branch? || github_utils.release_branch?) && !github_utils.wip_feature? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| We've enhanced the shipping label creation flow to ensure a smoother and more intuitive experience. This improvement aims to streamline your order fulfillment process, making it faster and more efficient. Please continue sending us feedback – we are listening! | ||
| We're excited to offer support for third-party Passkey providers. This update is designed to provide WordPress.com users with more flexibility and convenience in how they manage their account's security. Get ready to say goodbye to password fatigue and hello to a smoother, secure login experience! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.