Merge branch 'rnmobile/add/embed-block-integration-tests' into rnmobi…

…le/add/embed-block-integration-tests-2

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # Documentation
-/docs                                           @chrisvanpatten @ajitbohra
-/docs/designers-developers/developers           @chrisvanpatten @mkaz @ajitbohra
-/docs/designers-developers/designers            @chrisvanpatten @mkaz @ajitbohra
+/docs                                           @ajitbohra
+/docs/designers-developers/developers           @mkaz @ajitbohra
+/docs/designers-developers/designers            @mkaz @ajitbohra
 
 # Data
 /packages/api-fetch                             @nerrad @mmtr
@@ -56,7 +56,7 @@
 # Tooling
 /bin                                            @ntwb @nerrad @ajitbohra
 /bin/api-docs                                   @ntwb @nerrad @ajitbohra @oandregal
-/docs/tool                                      @chrisvanpatten @ajitbohra @oandregal
+/docs/tool                                      @ajitbohra @oandregal
 /packages/babel-plugin-import-jsx-pragma        @ntwb @nerrad @ajitbohra
 /packages/babel-plugin-makepot                  @ntwb @nerrad @ajitbohra
 /packages/babel-preset-default                  @gziolo @ntwb @nerrad @ajitbohra
@@ -80,7 +80,7 @@
 /packages/stylelint-config                      @ntwb
 
 # UI Components
-/packages/components                            @ajitbohra @jaymanpandya @chrisvanpatten
+/packages/components                            @ajitbohra @jaymanpandya
 /packages/compose                               @ajitbohra @jaymanpandya
 /packages/element                               @ajitbohra @jaymanpandya
 /packages/notices                               @ajitbohra @jaymanpandya

.github/workflows/build-plugin-zip.yml

@@ -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 gutenberg@wordpress.org
+
+            - 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]

.github/workflows/rnmobile-ios-runner.yml

@@ -14,11 +14,12 @@ concurrency:
 
 jobs:
     test:
-        runs-on: macos-latest
-        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
+        runs-on: macos-11
+        # if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
+        if: ${{ false }} # Skip the job until we manage to fix the unavailable environment error when running the E2E tests.
         strategy:
             matrix:
-                xcode: [12.2]
+                xcode: [12.5.1]
                 native-test-name: [gutenberg-editor-initial-html]
                 node: ['14']
 

README.md

@@ -35,7 +35,7 @@ Get hands on: check out the [block editor live demo](https://wordpress.org/guten
 
 Extending and customizing is at the heart of the WordPress platform, this is no different for the Gutenberg project. The editor and future products can be extended by third-party developers using plugins.
 
-Review the [Create a Block tutorial](/docs/getting-started/tutorials/create-block/README.md) for the fastest way to get started extending the block editor. See the [Developer Documentation](https://developer.wordpress.org/block-editor/#develop-for-the-block-editor) for extensive tutorials, documentation, and API references.
+Review the [Create a Block tutorial](/docs/getting-started/create-block/README.md) for the fastest way to get started extending the block editor. See the [Developer Documentation](https://developer.wordpress.org/block-editor/#develop-for-the-block-editor) for extensive tutorials, documentation, and API references.
 
 ### Contribute to Gutenberg