-
Notifications
You must be signed in to change notification settings - Fork 137
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/add-credential-manager-support
- Loading branch information
Showing
81 changed files
with
2,605 additions
and
601 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,12 @@ name: ☢️ Danger | |
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned] | ||
| types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned] | ||
|
|
||
| jobs: | ||
| dangermattic: | ||
| uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk | ||
| # runs on draft PRs only for opened / synchronize events | ||
| if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }} | ||
| uses: Automattic/dangermattic/.github/workflows/[email protected] | ||
| secrets: | ||
| github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }} | ||
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,58 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| def release_branch? | ||
| danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/') | ||
| end | ||
| github.dismiss_out_of_range_messages | ||
|
|
||
| def main_branch? | ||
| danger.github.branch_for_base == 'trunk' | ||
| end | ||
| # `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) | ||
|
|
||
| def wip_feature? | ||
| has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') } | ||
| has_wip_title = github.pr_title.include?('WIP') | ||
| manifest_pr_checker.check_gemfile_lock_updated | ||
|
|
||
| has_wip_label || has_wip_title | ||
| end | ||
| android_release_checker.check_release_notes_and_play_store_strings | ||
|
|
||
| return if github.pr_labels.include?('Releases') | ||
| android_strings_checker.check_strings_do_not_refer_resource | ||
|
|
||
| github.dismiss_out_of_range_messages | ||
| # 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 | ||
|
|
||
| manifest_pr_checker.check_gemfile_lock_updated | ||
| common_release_checker.check_internal_release_notes_changed(report_type: :message) | ||
|
|
||
| labels_checker.check( | ||
| do_not_merge_labels: ['status: do not merge'], | ||
| required_labels: [//], | ||
| required_labels_error: 'PR requires at least one label.' | ||
| android_release_checker.check_modified_strings_on_release | ||
|
|
||
| tracks_checker.check_tracks_changes( | ||
| tracks_files: [ | ||
| 'AnalyticsTracker.kt', | ||
| 'AnalyticsEvent.kt', | ||
| 'LoginAnalyticsTracker.kt' | ||
| ], | ||
| tracks_usage_matchers: [ | ||
| /AnalyticsTracker\.track/ | ||
| ], | ||
| tracks_label: '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
22 changes: 0 additions & 22 deletions
22
WooCommerce/src/main/kotlin/com/woocommerce/android/di/ProductImageMapModule.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.