Merge branch 'trunk' into try/expanding-alignments-site-title-navigation

Author: kjellr

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

@@ -18,15 +18,46 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
+    compute-stable-branches:
+        name: Compute current and next stable release branches
+        runs-on: ubuntu-latest
+        outputs:
+            current_stable_branch: ${{ steps.get_branches.outputs.current_stable_branch }}
+            next_stable_branch: ${{ steps.get_branches.outputs.next_stable_branch }}
+        steps:
+            - name: Get current and next stable release branches
+              id: get_branches
+              run: |
+                  curl \
+                    -H "Accept: application/vnd.github.v3+json" \
+                    -o latest.json \
+                    "https://api.github.com/repos/${{ github.repository }}/releases/latest"
+                  LATEST_STABLE_TAG=$(jq --raw-output '.tag_name' latest.json)
+                  IFS='.' read LATEST_STABLE_MAJOR LATEST_STABLE_MINOR LATEST_STABLE_PATCH <<< "${LATEST_STABLE_TAG#v}"
+                  echo "::set-output name=current_stable_branch::release/${LATEST_STABLE_MAJOR}.${LATEST_STABLE_MINOR}"
+                  if [[ ${LATEST_STABLE_MINOR} == "9" ]]; then
+                    echo "::set-output name=next_stable_branch::release/$((LATEST_STABLE_MAJOR + 1)).0"
+                  else
+                    echo "::set-output name=next_stable_branch::release/${LATEST_STABLE_MAJOR}.$((LATEST_STABLE_MINOR + 1))"
+                  fi
+
     bump-version:
         name: Bump version
         runs-on: ubuntu-latest
+        needs: compute-stable-branches
         if: |
             github.repository == 'WordPress/gutenberg' &&
-            github.event_name == 'workflow_dispatch' &&
-            github.ref == 'refs/heads/trunk' && (
-              github.event.inputs.version == 'rc' ||
-              github.event.inputs.version == 'stable'
+            github.event_name == 'workflow_dispatch' && (
+              (
+                github.ref == 'refs/heads/trunk' ||
+                endsWith( github.ref, needs.compute-stable-branches.outputs.next_stable_branch )
+              ) && (
+                github.event.inputs.version == 'rc' ||
+                github.event.inputs.version == 'stable'
+              ) || (
+                endsWith( github.ref, needs.compute-stable-branches.outputs.current_stable_branch ) &&
+                github.event.inputs.version == 'stable'
+              )
             )
         outputs:
             old_version: ${{ steps.get_version.outputs.old_version }}
@@ -91,13 +122,17 @@ jobs:
                   sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" gutenberg.php
                   sed -i "s/${{ steps.get_version.outputs.old_version }}/${VERSION}/g" readme.txt
 
-            - name: Commit the version bump
+            - name: Commit the version bump to the 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 }}"
 
-            - name: Cherry-pick to trunk
+            - 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
               run: |
                   git checkout trunk
                   git pull

.github/workflows/bundle-size.yml

@@ -55,7 +55,8 @@ jobs:
                   path: ~/.npm
                   key: ${{ runner.os }}-node-${{ matrix.node }}-npm-cache-${{ hashFiles('**/package-lock.json') }}
 
-            - uses: preactjs/compressed-size-action@7d87f60a6b0c7d193b8183ce859ed00b356ea92f # v2.1.0
+            - uses: preactjs/compressed-size-action@df6e03e187079aef959a2878311639c77b95ee2e # v2.2.0
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
                   pattern: '{build/**/*.min.js,build/**/*.css}'
+                  clean-script: 'distclean'