[Github-Actions-Workflows][Plugin-Release] Allow shipping a point-release for an older stable release

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

@@ -56,7 +56,7 @@ jobs:
                 github.event.inputs.version == 'rc' ||
                 github.event.inputs.version == 'stable'
               ) || (
-                endsWith( github.ref, needs.compute-stable-branches.outputs.current_stable_branch ) &&
+                startsWith( github.ref, 'refs/heads/release/' ) &&
                 github.event.inputs.version == 'stable'
               )
             )
@@ -71,7 +71,7 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
               with:
-                  token: ${{ secrets.GUTENBERG_TOKEN }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Compute old and new version
               id: get_version
@@ -164,18 +164,25 @@ jobs:
 
         steps:
             - name: Checkout code
+              # The following is debug code, should be reverted before merging. See commit that added this for more info.
+              if: false
               uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
               with:
                   ref: ${{ needs.bump-version.outputs.release_branch || github.ref }}
 
             - name: Use desired version of Node.js
+              # The following is debug code, should be reverted before merging. See commit that added this for more info.
+              if: false
               uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
               with:
                   node-version-file: '.nvmrc'
                   cache: npm
 
             - name: Build Gutenberg plugin ZIP file
-              run: ./bin/build-plugin-zip.sh
+              # The following is debug code, should be reverted before merging. See commit that added this for more info.
+              run: |
+                  echo 'Stable tag: V.V.V' > readme.txt
+                  zip -j gutenberg.zip readme.txt
               env:
                   NO_CHECKS: 'true'
 
@@ -186,7 +193,10 @@ jobs:
                   path: ./gutenberg.zip
 
             - name: Build release notes draft
-              if: ${{ needs.bump-version.outputs.new_version }}
+              # Debug: if we want fast runs, then this should be disabled as this won't
+              # work if the real plugin isn't built (becuase npm install is needed to install
+              # some needed packages that the `other:changelog` task uses`).
+              if: false
               env:
                   VERSION: ${{ needs.bump-version.outputs.new_version }}
               run: |
@@ -202,7 +212,8 @@ jobs:
                   fi
 
             - name: Upload release notes artifact
-              if: ${{ needs.bump-version.outputs.new_version }}
+              # The following is debug code, should be reverted before merging. See commit that added this for more info.
+              if: false
               uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
               with:
                   name: release-notes
@@ -271,6 +282,8 @@ jobs:
                   name: gutenberg-plugin
 
             - name: Download Release Notes Artifact
+              # The following is debug code, should be reverted before merging. See commit that added this for more info.
+              if: false
               uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
               with:
                   name: release-notes
@@ -285,8 +298,9 @@ jobs:
                   release_name: ${{ steps.get_release_version.outputs.version }}
                   commitish: ${{ needs.bump-version.outputs.release_branch || github.ref }}
                   draft: true
-                  prerelease: ${{ contains(needs.bump-version.outputs.new_version, 'rc') }}
-                  body_path: release-notes.txt
+                  # The following is debug code, should be reverted before merging. See commit that added this for more info.
+                  # prerelease: ${{ contains(needs.bump-version.outputs.new_version, 'rc') }}
+                  # body_path: release-notes.txt
 
             - name: Upload Release Asset
               id: upload-release-asset
@@ -304,7 +318,7 @@ jobs:
         runs-on: ubuntu-latest
         environment: WordPress packages
         needs: [bump-version, build]
-        if: ${{ endsWith( needs.bump-version.outputs.new_version, '-rc.1' ) }}
+        if: ${{ false }}
         steps:
             - name: Checkout (for CLI)
               uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

.github/workflows/upload-release-to-plugin-repo.yml

@@ -5,10 +5,58 @@ on:
         types: [published]
 
 jobs:
+    compute-should-update-trunk:
+        name: Decide if trunk or tag
+        runs-on: ubuntu-latest
+        outputs:
+            should_update_trunk: ${{ steps.compute_should_update_trunk.outputs.should_update_trunk }}
+
+        steps:
+            - name: Fetch latest version in the WP core repo
+              id: compute_latest_version_in_core_repo
+              run: |
+                  latest_version_in_core_repo=$(curl -s 'https://api.wordpress.org/plugins/info/1.2/?action=plugin_information&request\[slug\]=gutenberg' | jq -r '.version')
+                  echo "Latest Core Repo version: $latest_version_in_core_repo"
+                  echo "version=$latest_version_in_core_repo" >> $GITHUB_OUTPUT
+
+            - name: Decide if it is a trunk or tag update
+              id: compute_should_update_trunk
+              env:
+                  GITHUB_REF: ${{ github.ref }}
+              run: |
+                  latestPublishedVersion=$(echo "$GITHUB_REF" | sed -E 's/refs\/tags\/(v?)([0-9.]+)/\2/')
+                  latestVersionInCoreRepo="${{ steps.compute_latest_version_in_core_repo.outputs.version }}"
+
+                  # Determines if the first version string is greater than the second version string.
+                  #
+                  # Params:
+                  #   $1 - The first version string to compare, which may have an optional leading "v".
+                  #   $2 - The second version string to compare, which may have an optional leading "v".
+                  #
+                  # Return values:
+                  #   0 - The first version string is greater than the second version string.
+                  #   1 - The first version string is less than or equal to the second version string.
+                  is_first_version_greater_than_second() {
+                    v1=${1#v}
+                    v2=${2#v}
+                    dpkg --compare-versions "$v1" gt "$v2"
+                    return $?
+                  }
+
+                  # Only update trunk *if* the published release's version in Github is GREATER
+                  # than the version currently published in the WP plugins repo. If not, then it
+                  # will upload it as a new tag.
+                  shouldUpdateTrunk=false
+                  if is_first_version_greater_than_second "$latestPublishedVersion" "$latestVersionInCoreRepo"; then
+                     shouldUpdateTrunk=true
+                  fi
+
+                  echo "Should update trunk: $shouldUpdateTrunk"
+                  echo "should_update_trunk=$shouldUpdateTrunk" >> $GITHUB_OUTPUT
+
     get-release-branch:
         name: Get release branch name
         runs-on: ubuntu-latest
-        if: github.event.release.assets[0]
         outputs:
             release_branch: ${{ steps.get_release_branch.outputs.release_branch }}
 
@@ -25,7 +73,8 @@ jobs:
     update-changelog:
         name: Update Changelog on ${{ matrix.branch }} branch
         runs-on: ubuntu-latest
-        if: github.event.release.assets[0]
+        if: |
+            github.event.release.assets[0]
         needs: get-release-branch
         env:
             TAG: ${{ github.event.release.tag_name }}
@@ -42,7 +91,7 @@ jobs:
               uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
               with:
                   ref: ${{ matrix.branch }}
-                  token: ${{ secrets.GUTENBERG_TOKEN }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Update the Changelog to include the release notes
               run: |
@@ -95,25 +144,23 @@ jobs:
                   path: ./changelog.txt
 
     upload:
-        name: Upload Gutenberg Plugin
+        name: Publish as trunk (and tag)
         runs-on: ubuntu-latest
         environment: wp.org plugin
-        needs: update-changelog
-        if: ${{ !github.event.release.prerelease && github.event.release.assets[0] }}
+        needs: [compute-should-update-trunk, update-changelog]
+        if: |
+            needs.compute-should-update-trunk.outputs.should_update_trunk == 'true' &&
+            !github.event.release.prerelease && github.event.release.assets[0]
         env:
-            PLUGIN_REPO_URL: 'https://plugins.svn.wordpress.org/gutenberg'
+            PLUGIN_REPO_URL: 'http://caffeine.ngrok.io/svn/gutenberg'
             STABLE_VERSION_REGEX: '[0-9]\+\.[0-9]\+\.[0-9]\+\s*'
             SVN_USERNAME: ${{ secrets.svn_username }}
             SVN_PASSWORD: ${{ secrets.svn_password }}
             VERSION: ${{ github.event.release.name }}
 
         steps:
             - name: Check out Gutenberg trunk from WP.org plugin repo
-              run: svn checkout "$PLUGIN_REPO_URL/trunk"
-
-            - name: Get previous stable version
-              id: get_previous_stable_version
-              run: echo "stable_version=$(awk -F ':\ ' '$1 == "Stable tag" {print $2}' ./trunk/readme.txt)" >> $GITHUB_OUTPUT
+              run: svn checkout "$PLUGIN_REPO_URL/trunk" --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
 
             - name: Delete everything
               working-directory: ./trunk
@@ -130,8 +177,8 @@ jobs:
             - name: Replace the stable tag placeholder with the existing stable tag on the SVN repository
               env:
                   STABLE_TAG_PLACEHOLDER: 'Stable tag: V\.V\.V'
-                  STABLE_TAG: 'Stable tag: ${{ steps.get_previous_stable_version.outputs.stable_version }}'
-              run: sed -i "s/${STABLE_TAG_PLACEHOLDER}/${STABLE_TAG}/g" ./trunk/readme.txt
+              run: |
+                  sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" ./trunk/readme.txt
 
             - name: Download Changelog Artifact
               uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
@@ -159,3 +206,51 @@ jobs:
                   sed -i "s/Stable tag: ${STABLE_VERSION_REGEX}/Stable tag: ${VERSION}/g" ./readme.txt
                   svn commit -m "Releasing version $VERSION" \
                    --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
+
+    upload-tag:
+        name: Publish as tag
+        runs-on: ubuntu-latest
+        environment: wp.org plugin
+        needs: [compute-should-update-trunk, update-changelog]
+        if: |
+            needs.compute-should-update-trunk.outputs.should_update_trunk == 'false' &&
+            !github.event.release.prerelease && github.event.release.assets[0]
+        env:
+            PLUGIN_REPO_URL: 'http://caffeine.ngrok.io/svn/gutenberg'
+            STABLE_VERSION_REGEX: '[0-9]\+\.[0-9]\+\.[0-9]\+\s*'
+            SVN_USERNAME: ${{ secrets.svn_username }}
+            SVN_PASSWORD: ${{ secrets.svn_password }}
+            VERSION: ${{ github.event.release.name }}
+
+        steps:
+            - name: Check out Gutenberg tags from WP.org plugin repo
+              run: svn checkout "$PLUGIN_REPO_URL/tags" --username "$SVN_USERNAME" --password "$SVN_PASSWORD"
+
+            - name: Download and unzip Gutenberg plugin asset into tags folder
+              env:
+                  PLUGIN_URL: ${{ github.event.release.assets[0].browser_download_url }}
+              run: |
+                  # do the magic here
+                  curl -L -o gutenberg.zip $PLUGIN_URL
+                  unzip gutenberg.zip -d tags/$VERSION
+                  rm gutenberg.zip
+
+            - name: Replace the stable tag placeholder with the existing stable tag on the SVN repository
+              env:
+                  STABLE_TAG_PLACEHOLDER: 'Stable tag: V\.V\.V'
+              run: |
+                  sed -i "s/$STABLE_TAG_PLACEHOLDER/Stable tag: $VERSION/g" ./tags/$VERSION/readme.txt
+
+            - name: Download Changelog Artifact
+              uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
+              with:
+                  name: changelog for tags
+                  path: tags/${{ github.event.release.name }}
+
+            - name: Commit the content changes
+              working-directory: ./tags
+              run: |
+                  svn st | grep '^?' | awk '{print $2}' | xargs -r svn add
+                  svn st | grep '^!' | awk '{print $2}' | xargs -r svn rm
+                  svn commit -m "Committing version $VERSION" \
+                   --no-auth-cache --non-interactive  --username "$SVN_USERNAME" --password "$SVN_PASSWORD"