Skip to content

Commit c305f72

Browse files
Merge remote-tracking branch 'origin/staging' into production
2 parents 63bd8a5 + dfcc1d7 commit c305f72

File tree

254 files changed

+48803
-56466
lines changed

Some content is hidden

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

254 files changed

+48803
-56466
lines changed

.github/workflows/manual-branch-merges.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@ jobs:
1010
merge-branches:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- name: Check out source code
13+
- name: Require trunk dispatch
14+
if: github.ref != 'refs/heads/trunk'
15+
run: |
16+
echo "This workflow must be run from trunk."
17+
exit 1
18+
19+
- name: Check out trunk
1420
uses: actions/checkout@v5.0.0
1521
with:
1622
fetch-depth: 0
23+
ref: trunk
1724

1825
- name: Configure git
1926
run: |
@@ -44,4 +51,4 @@ jobs:
4451
git checkout -B staging origin/staging
4552
git merge --no-ff origin/trunk || { echo "Merge conflict merging trunk into staging."; exit 1; }
4653
git push origin staging
47-
tag_and_push "${DATE}.staging"
54+
tag_and_push "${DATE}.staging"

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"ignore": [],
120120
"current": {
121121
"0.1": "0.1.8",
122-
"0.2": "0.2.1"
122+
"0.2": "0.2.3"
123123
}
124124
},
125125
"vip-agentforce": {

vip-integrations/gutenberg-0.2/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
[![Static Analysis (Linting, License, Type checks...)](<https://github.com/WordPress/gutenberg/workflows/Static%20Analysis%20(Linting,%20License,%20Type%20checks...)/badge.svg>)](https://github.com/WordPress/gutenberg/actions?query=workflow%3A%22Static+Analysis+%28Linting%2C+License%2C+Type+checks...%29%22+branch%3Atrunk)
55
[![Unit Tests](https://github.com/WordPress/gutenberg/workflows/Unit%20Tests/badge.svg)](https://github.com/WordPress/gutenberg/actions?query=workflow%3A%22Unit+Tests%22+branch%3Atrunk)
66
[![Create Block](https://github.com/WordPress/gutenberg/workflows/Create%20Block/badge.svg)](https://github.com/WordPress/gutenberg/actions?query=workflow%3A%22Create+Block%22+branch%3Atrunk)
7-
[![React Native E2E Tests (iOS)](<https://github.com/WordPress/gutenberg/workflows/React%20Native%20E2E%20Tests%20(iOS)/badge.svg>)](https://github.com/WordPress/gutenberg/actions?query=workflow%3A%22React+Native+E2E+Tests+%28iOS%29%22+branch%3Atrunk)
8-
[![React Native E2E Tests (Android)](<https://github.com/WordPress/gutenberg/workflows/React%20Native%20E2E%20Tests%20(Android)/badge.svg>)](https://github.com/WordPress/gutenberg/actions?query=workflow%3A%22React+Native+E2E+Tests+%28Android%29%22+branch%3Atrunk)
97

108
<a href="https://wordpress.github.io/gutenberg/" target="_blank"><img src="https://raw.githubusercontent.com/storybooks/brand/master/badge/badge-storybook.svg" alt="Storybook Badge" /></a>
119

vip-integrations/gutenberg-0.2/build/constants.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
*/
1010

1111
return array(
12-
'version' => '22.5.0-rc.1',
12+
'version' => '22.5.0',
1313
'build_url' => plugin_dir_url( __FILE__ ),
1414
);

0 commit comments

Comments
 (0)