-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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 replace/confirm-et-al
* trunk: (494 commits) remove consecutive rc warning (#35855) Update Changelog for 11.8.0-rc.2 Bump plugin version to 11.8.0-rc.2 [RNMobile] Disable React Native E2E Tests (iOS) (#35844) Add section about using the schema during development (#35835) Add a method to disable auto-accepting dialogs (#35828) Wrap NavigationContainer with SafeAreaView. (#35570) Update Appium to 1.22.0 (#35829) Post Comment: Handle the case where a comment does not exist (#35810) Clear selected block when clicking on the gray background (#35816) Post excerpt: Don't print the wrapper when there is no excerpt (#35749) [Block] Navigation: Fix padding for social links on mobile (#35824) Fix issue with responsive navigation causing wrapping. (#35820) [Block Editor]: Fix displaying only `none` alignment option (#35822) Add API to access global settings, styles, and stylesheet (#34843) Mobile Release v1.64.1 (#35804) Add resizer to template part focus mode (#35728) Update Changelog for 11.7.1 Gallery block: Only show the gallery upload error message if mixed multiple files uploaded (#35790) Update Changelog for 11.8.0-rc.1 ...
- Loading branch information
Showing
1,261 changed files
with
29,928 additions
and
20,107 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,6 +64,8 @@ jobs: | |
| old_version: ${{ steps.get_version.outputs.old_version }} | ||
| new_version: ${{ steps.get_version.outputs.new_version }} | ||
| release_branch: ${{ steps.get_version.outputs.release_branch }} | ||
| release_branch_commit: ${{ steps.commit_version_bump_to_release_branch.outputs.version_bump_commit }} | ||
| trunk_commit: ${{ steps.commit_version_bump_to_trunk.outputs.version_bump_commit }} | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
|
|
@@ -125,23 +127,27 @@ jobs: | |
| sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" readme.txt | ||
| - name: Commit the version bump to the release branch | ||
| id: commit_version_bump_to_release_branch | ||
| run: | | ||
| git add gutenberg.php package.json package-lock.json readme.txt | ||
| git commit -m "Bump plugin version to ${{ steps.get_version.outputs.new_version }}" | ||
| git push --set-upstream origin "${{ steps.get_version.outputs.release_branch }}" | ||
| echo "::set-output name=version_bump_commit::$(git rev-parse --verify --short HEAD)" | ||
| - name: Fetch trunk | ||
| if: ${{ github.ref != 'refs/heads/trunk' }} | ||
| run: git fetch --depth=1 origin trunk | ||
|
|
||
| - name: Cherry-pick the version bump commit to trunk | ||
| id: commit_version_bump_to_trunk | ||
| run: | | ||
| git checkout trunk | ||
| git pull | ||
| TRUNK_VERSION=$(jq --raw-output '.version' package.json) | ||
| if [[ ${{ steps.get_version.outputs.old_version }} == "$TRUNK_VERSION" ]]; then | ||
| git cherry-pick "${{ steps.get_version.outputs.release_branch }}" | ||
| git push | ||
| echo "::set-output name=version_bump_commit::$(git rev-parse --verify --short HEAD)" | ||
| fi | ||
| build: | ||
|
|
@@ -154,6 +160,8 @@ jobs: | |
| github.event_name == 'workflow_dispatch' || | ||
| github.repository == 'WordPress/gutenberg' | ||
| ) | ||
| outputs: | ||
| job_status: ${{ job.status }} | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
|
|
@@ -201,6 +209,51 @@ jobs: | |
| name: release-notes | ||
| path: ./release-notes.txt | ||
|
|
||
| revert-version-bump: | ||
| name: Revert version bump if build failed | ||
| needs: [bump-version, build] | ||
| runs-on: ubuntu-latest | ||
| if: | | ||
| always() && | ||
| ( needs.build.outputs.job_status == 'failure' ) && | ||
| needs.bump-version.outputs.release_branch_commit | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 | ||
| with: | ||
| fetch-depth: 2 | ||
| ref: ${{ needs.bump-version.outputs.release_branch }} | ||
| token: ${{ secrets.GUTENBERG_TOKEN }} | ||
|
|
||
| - name: Configure git user name and email | ||
| run: | | ||
| git config user.name "Gutenberg Repository Automation" | ||
| git config user.email [email protected] | ||
| - name: Revert version bump commit on release branch | ||
| if: | | ||
| github.event.inputs.version == 'stable' || | ||
| contains( needs.bump-version.outputs.old_version, 'rc' ) | ||
| run: | | ||
| git revert --no-edit ${{ needs.bump-version.outputs.release_branch_commit }} | ||
| git push --set-upstream origin "${{ needs.bump-version.outputs.release_branch }}" | ||
| - name: Delete release branch if it was only just created for the RC | ||
| if: | | ||
| github.event.inputs.version == 'rc' && | ||
| ! contains( needs.bump-version.outputs.old_version, 'rc' ) | ||
| run: | | ||
| git push origin :"${{ needs.bump-version.outputs.release_branch }}" | ||
| - name: Revert version bump on trunk | ||
| if: ${{ needs.bump-version.outputs.trunk_commit }} | ||
| run: | | ||
| git fetch --depth=2 origin trunk | ||
| git checkout trunk | ||
| git revert --no-edit ${{ needs.bump-version.outputs.trunk_commit }} | ||
| git push --set-upstream origin trunk | ||
| create-release: | ||
| name: Create Release Draft and Attach Asset | ||
| needs: [bump-version, build] | ||
|
|
||
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
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
Oops, something went wrong.