Skip to content

Commit

Permalink
iAPI: Fix the logic path that merges plain objects - Backport to 6.7.2 (
Browse files Browse the repository at this point in the history
#68713)

* Fix the logic path that merges plain objects

* Upgrade browserslist and webcompat data packages (#65926)

* Upgrade browserslist and webcompat data packages

* Limit view scripts to the Form block

* Update blocks.js

* Upgrade also webpack

* Update snapshots

---------

Co-authored-by: jsnajdr <[email protected]>
Co-authored-by: gziolo <[email protected]>
Co-authored-by: sirreal <[email protected]>

* Sync package-lock

* Revert changes in packages/scripts/package.json

* CI: Skip native jobs (#67799)

Co-authored-by: youknowriad <[email protected]>
Co-authored-by: tyxla <[email protected]>
Co-authored-by: dcalhoun <[email protected]>

---------

Co-authored-by: Jarda Snajdr <[email protected]>
Co-authored-by: jsnajdr <[email protected]>
Co-authored-by: gziolo <[email protected]>
Co-authored-by: sirreal <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: Riad Benguella <[email protected]>
Co-authored-by: youknowriad <[email protected]>
Co-authored-by: tyxla <[email protected]>
Co-authored-by: dcalhoun <[email protected]>
  • Loading branch information
10 people authored Jan 21, 2025
1 parent e5ef7c6 commit 8742100
Show file tree
Hide file tree
Showing 9 changed files with 219 additions and 204 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/rnmobile-android-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ concurrency:

jobs:
test:
runs-on: macos-12
if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
runs-on: macos-13
if: false
#if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
strategy:
matrix:
native-test-name: [gutenberg-editor-rendering]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/rnmobile-ios-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ concurrency:

jobs:
test:
runs-on: macos-12
if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
runs-on: macos-13
if: false
#if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
strategy:
matrix:
xcode: ['14.2']
Expand Down
Loading

0 comments on commit 8742100

Please sign in to comment.