Skip to content

Commit 981cb5b

Browse files
committed
Merge branch 'trunk' into task/22459-stats-traffic-load-required-data
2 parents 205bbf3 + f792fde commit 981cb5b

247 files changed

Lines changed: 12333 additions & 8366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ PR submission checklist:
1818
- [ ] I have considered adding accessibility improvements for my changes.
1919
- [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
2020

21-
UI Changes testing checklist:
21+
Testing checklist:
22+
- [ ] WordPress.com sites and self-hosted Jetpack sites.
2223
- [ ] Portrait and landscape orientations.
2324
- [ ] Light and dark modes.
2425
- [ ] Fonts: Larger, smaller and bold text.

.github/workflows/run-danger.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ name: ☢️ Danger
22

33
on:
44
pull_request:
5-
types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned]
5+
types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned]
66

77
jobs:
88
dangermattic:
9-
uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk
9+
# runs on draft PRs only for opened / synchronize events
10+
if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }}
11+
uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0
1012
secrets:
1113
github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_tags_cards.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,31 @@
1515
"page": 1,
1616
"refresh": 1,
1717
"cards": [
18+
{
19+
"type": "interests_you_may_like",
20+
"data": [
21+
{
22+
"slug": "blogging",
23+
"title": "Blogging",
24+
"score": 278
25+
},
26+
{
27+
"slug": "travel",
28+
"title": "Travel",
29+
"score": 251
30+
},
31+
{
32+
"slug": "photos",
33+
"title": "Photos",
34+
"score": 173
35+
},
36+
{
37+
"slug": "technology",
38+
"title": "Technology",
39+
"score": 139
40+
}
41+
]
42+
},
1843
{
1944
"type": "interests_you_may_like",
2045
"data": [
@@ -3934,13 +3959,12 @@
39343959
"use_excerpt": false
39353960
}
39363961
}
3937-
],
3938-
"next_page_handle": "ZnJvbT04JnJlZnJlc2g9MQ=="
3962+
]
39393963
},
39403964
"headers": {
39413965
"Content-Type": "application/json",
39423966
"Connection": "keep-alive",
39433967
"Cache-Control": "no-cache, must-revalidate, max-age=0"
39443968
}
39453969
}
3946-
}
3970+
}

Dangerfile

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
11
# frozen_string_literal: true
22

3-
def release_branch?
4-
danger.github.branch_for_base.start_with?('release/') || danger.github.branch_for_base.start_with?('hotfix/')
5-
end
3+
github.dismiss_out_of_range_messages
64

7-
def main_branch?
8-
danger.github.branch_for_base == 'trunk'
9-
end
5+
# `files: []` forces rubocop to scan all files, not just the ones modified in the PR
6+
rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
107

11-
def wip_feature?
12-
has_wip_label = github.pr_labels.any? { |label| label.include?('WIP') }
13-
has_wip_title = github.pr_title.include?('WIP')
8+
manifest_pr_checker.check_all_manifest_lock_updated
149

15-
has_wip_label || has_wip_title
10+
podfile_checker.check_podfile_does_not_have_branch_references
11+
12+
ios_release_checker.check_core_data_model_changed
13+
ios_release_checker.check_release_notes_and_app_store_strings
14+
15+
# skip remaining checks if we're in a release-process PR
16+
if github.pr_labels.include?('Releases')
17+
message('This PR has the `Releases` label: some checks will be skipped.')
18+
return
1619
end
1720

18-
return if github.pr_labels.include?('Releases')
21+
common_release_checker.check_internal_release_notes_changed(report_type: :message)
1922

20-
github.dismiss_out_of_range_messages
23+
ios_release_checker.check_modified_translations_on_release_branch
2124

22-
manifest_pr_checker.check_all_manifest_lock_updated
25+
view_changes_checker.check
26+
27+
pr_size_checker.check_diff_size(max_size: 500)
28+
29+
# skip remaining checks if the PR is still a Draft
30+
if github.pr_draft?
31+
message('This PR is still a Draft: some checks will be skipped.')
32+
return
33+
end
2334

2435
labels_checker.check(
2536
do_not_merge_labels: ['[Status] DO NOT MERGE'],
2637
required_labels: [//],
2738
required_labels_error: 'PR requires at least one label.'
2839
)
2940

30-
view_changes_need_screenshots.view_changes_need_screenshots
31-
32-
pr_size_checker.check_diff_size
33-
34-
# skip check for draft PRs and for WIP features unless the PR is against the main branch or release branch
35-
milestone_checker.check_milestone_due_date(days_before_due: 4) unless github.pr_draft? || (wip_feature? && !(release_branch? || main_branch?))
36-
37-
rubocop.lint(inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
41+
# runs the milestone check if this is not a WIP feature and the PR is against the main branch or the release branch
42+
milestone_checker.check_milestone_due_date(days_before_due: 4) if (github_utils.main_branch? || github_utils.release_branch?) && !github_utils.wip_feature?

Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ source 'https://rubygems.org'
44

55
gem 'cocoapods', '~> 1.14'
66
gem 'commonmarker'
7-
gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic'
7+
gem 'danger-dangermattic', '~> 1.0'
88
gem 'dotenv'
9-
# 2.217.0 includes a fix for Xcode 15 test results parsing in CI
10-
gem 'fastlane', '~> 2.217'
9+
# 2.219.0 includes a fix for a bug introduced in 2.218.0
10+
# See https://github.com/fastlane/fastlane/issues/21762#issuecomment-1875208663
11+
gem 'fastlane', '~> 2.219'
1112
gem 'fastlane-plugin-appcenter', '~> 2.1'
1213
gem 'fastlane-plugin-sentry'
1314
# This comment avoids typing to switch to a development version for testing.
@@ -17,7 +18,7 @@ gem 'fastlane-plugin-sentry'
1718
# gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref: '2cb009edaee3d058a61cfeb503e533eb0647f108'
1819
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.3'
1920
gem 'rake'
20-
gem 'rubocop', '~> 1.30'
21+
gem 'rubocop', '~> 1.60'
2122
gem 'rubocop-rake', '~> 0.6'
2223
gem 'xcpretty-travis-formatter'
2324

0 commit comments

Comments
 (0)