Skip to content

Commit

Permalink
Merge branch 'master' into add/boost-e2e-workflow-dependencies-trigger
Browse files Browse the repository at this point in the history
* master: (28 commits)
  Prepare for 10.4-a.7 (#21797)
  Check if maxwidth exists before trying to call .length (#21785)
  Podcast Player: Increase podcast shown (#21661)
  licensing: jetpack-js-test-runner is a dev dependency (#21794)
  Update dependency @mdn/browser-compat-data to v4.0.11 (#21792)
  Tests: Fix unit tests for wpcom (#21649)
  SSO: Fix Button Text Alignment on Mobile   (#18770)
  Add/my jetpack skeleton (#21464)
  Identity Crisis: add unit tests for has_identity_crisis and get_mismatched_urls (#21754)
  Remove special cases for calling changelogger on packages/changelogger (#21783)
  eslint-config-target-es: Release 1.0.0! (#21766)
  Revert "WPCOM no longer forces home_urls to be http" (#21769)
  WPCOM no longer forces home_urls to be http (#21747)
  Revert and fix "Revert "Assets: do not use the new method yet (#21760)"" (#21763)
  eslint-config-target-es: Fix README.md (#21743)
  codesniffer: Disable CI on PHP 8.1 (#21742)
  RNA Pricing card component: Fix case where prices before and after match (#21757)
  Janitorial: update Jetpack version for 10.4-a.6 cycle (#21762)
  Releases: prepare changelog for 10.4-a.5 release (#21758)
  Assets: do not use the new method yet (#21760)
  ...
  • Loading branch information
davidlonjon committed Nov 18, 2021
2 parents ba4721a + fabc618 commit e38730f
Show file tree
Hide file tree
Showing 226 changed files with 3,562 additions and 507 deletions.
3 changes: 0 additions & 3 deletions .github/files/build-all-projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ for SLUG in "${SLUGS[@]}"; do
# Update the changelog, if applicable.
if [[ -x 'vendor/bin/changelogger' ]]; then
CHANGELOGGER=vendor/bin/changelogger
elif [[ -x 'bin/changelogger' ]]; then
# Changelogger itself doesn't have itself in vendor/.
CHANGELOGGER=bin/changelogger
elif jq -e '.["require-dev"]["automattic/jetpack-changelogger"] // false' composer.json > /dev/null; then
# Some plugins might build with `composer install --no-dev`.
CHANGELOGGER="$BASE/projects/packages/changelogger/bin/changelogger"
Expand Down
2 changes: 2 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@automattic/jetpack-config",
"@automattic/jetpack-connection",
"@automattic/jetpack-idc",
"@automattic/jetpack-licensing",
"@automattic/jetpack-storybook",
"@automattic/jetpack-webpack-config",
"automattic/jetpack-a8c-mc-stats",
Expand All @@ -44,6 +45,7 @@
"automattic/jetpack-lazy-images",
"automattic/jetpack-licensing",
"automattic/jetpack-logo",
"automattic/jetpack-my-jetpack",
"automattic/jetpack-options",
"automattic/jetpack-partner",
"automattic/jetpack-password-checker",
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/.sass-cache/
/node_modules
vendor/
/.nova/
/.vscode/
/logs
/allure-results/
Expand Down Expand Up @@ -51,4 +52,5 @@ phpcs.xml
/tools/docker/bin/jt/

# This file indicates we're in draft mode, which reduces checks
.jetpack-draft
.jetpack-draft

Loading

0 comments on commit e38730f

Please sign in to comment.