Internal: Update release branch with main branch [TMZ-803] (#583)

Author: hein-obox

.cursor/rules/github-workflows.mdc

@@ -0,0 +1,77 @@
+---
+description: GitHub Workflows and Actions YAML Rules for Hello Theme
+globs: ["**/*.yml", "**/*.yaml"]
+alwaysApply: true
+---
+
+# GitHub Workflows and Actions YAML Rules for Hello Theme
+
+## Core Principles
+
+### Assume Happy Path
+- Remove defensive checks that add little value
+- Assume branches exist, labels are correct, and operations succeed
+- Let failures fail naturally rather than adding extensive error handling
+- Focus on core functionality, not edge case handling
+
+### Keep Workflows Concise
+- Target 50-100 lines per workflow file
+- Extract complex logic to reusable scripts in `.github/scripts/`
+- Inline simple logic (templates, simple string operations)
+- Remove debugging and verbose logging
+
+### No Emojis
+- Never use emojis in workflow files, PR titles, or messages
+- Use plain text for all output and notifications
+
+## Script Extraction Guidelines
+
+### Extract to Scripts When:
+- Logic is complex (5+ lines of bash)
+- Logic is reused in multiple places
+- Logic benefits from testing independently
+
+### Keep Inline When:
+- Simple template strings
+- Single-line operations
+- Direct GitHub Actions expressions
+
+## Workflow Structure
+
+### Essential Steps Only
+- Checkout repository
+- Core workflow logic
+- Error handling only for critical failures
+
+### Remove These Steps:
+- Debugging/logging steps
+- Redundant validation steps
+- Conflict marker detection (redundant)
+
+## Code Style
+
+### YAML Formatting
+- Use consistent indentation (2 spaces)
+- Keep line length reasonable (max 120 characters)
+- Use multi-line strings for readability when needed
+- Empty line at end of file
+
+## Examples
+
+### Bad: Debugging Clutter
+```yaml
+- name: Log trigger and PR information
+  run: |
+    echo "Trigger: ${{ github.event.action }}"
+    echo "PR #${{ github.event.pull_request.number }}"
+    # ... more debugging output
+```
+
+### Bad: Unnecessary Validation
+```yaml
+if [ ! -f "style.css" ]; then
+  echo "::error:: Missing style.css"
+  continue
+fi
+# Assume happy path - these checks add little value
+```

.github/actions/theme-slack-notification-release/action.yml

@@ -7,72 +7,24 @@ inputs:
   PACKAGE_VERSION:
     required: true
     description: 'Release version'
-  BUILD_ZIP_PATH:
-    required: true
-    description: 'Path to theme zip file'
-  GITHUB_RELEASE_URL:
-    required: true
-    description: 'GitHub release URL'
   SLACK_CHANNEL:
     required: false
     default: '#tmz-hello-delivery'
     description: 'Slack channel to send notification to'
-  WPORG_DEPLOYMENT_STATUS:
-    required: false
-    default: 'skipped'
-    description: 'WordPress.org deployment status (deployed|skipped|disabled)'
 
 runs:
   using: 'composite'
   steps:
-    - name: Prepare deployment message
-      id: deployment-message
-      shell: bash
-      run: |
-        case "${{ inputs.WPORG_DEPLOYMENT_STATUS }}" in
-          "deployed")
-            MESSAGE="📦 *WordPress.org Deployment*\\n• ✅ Automatically deployed to WordPress.org\\n• Theme available at: https://wordpress.org/themes/hello-elementor/\\n• No manual upload required! 🎉"
-            ;;
-          "disabled")
-            MESSAGE="📦 *WordPress.org Deployment*\\n• ⚠️ Disabled in configuration\\n• Manual upload required to WordPress.org\\n• Download zip from GitHub release below"
-            ;;
-          *)
-            MESSAGE="📦 *WordPress.org Deployment*\\n• ⚠️ Skipped (deploy_to_wporg: false)\\n• Manual upload required to WordPress.org\\n• Download zip from GitHub release below"
-            ;;
-        esac
-        echo "DEPLOYMENT_MESSAGE=$MESSAGE" >> $GITHUB_ENV
-    
-    - name: Get file info
-      id: file-info
-      shell: bash
-      run: |
-        if [ -f "${{ inputs.BUILD_ZIP_PATH }}" ]; then
-          FILE_SIZE=$(stat -c%s "${{ inputs.BUILD_ZIP_PATH }}" 2>/dev/null || stat -f%z "${{ inputs.BUILD_ZIP_PATH }}")
-          FILE_SIZE_MB=$(echo "scale=2; $FILE_SIZE / 1024 / 1024" | bc -l 2>/dev/null || echo "$((FILE_SIZE / 1024 / 1024)).0")
-          echo "FILE_SIZE=$FILE_SIZE" >> $GITHUB_ENV
-          echo "FILE_SIZE_MB=${FILE_SIZE_MB}MB" >> $GITHUB_ENV
-        else
-          echo "FILE_SIZE_MB=Unknown" >> $GITHUB_ENV
-        fi
-
     - name: Post to Slack
       shell: bash
       env:
         CLOUD_SLACK_BOT_TOKEN: ${{ inputs.CLOUD_SLACK_BOT_TOKEN }}
         SLACK_CHANNEL: ${{ inputs.SLACK_CHANNEL }}
         PACKAGE_VERSION: ${{ inputs.PACKAGE_VERSION }}
-        FILE_SIZE_MB: ${{ env.FILE_SIZE_MB }}
-        DEPLOYMENT_MESSAGE: ${{ env.DEPLOYMENT_MESSAGE }}
-        GITHUB_RELEASE_URL: ${{ inputs.GITHUB_RELEASE_URL }}
-        BUILD_ZIP_PATH: ${{ inputs.BUILD_ZIP_PATH }}
       run: |
         node << 'NODE_SCRIPT'
         const slackChannel = process.env.SLACK_CHANNEL || '#tmz-hello-delivery';
         const packageVersion = process.env.PACKAGE_VERSION || '';
-        const fileSizeMb = process.env.FILE_SIZE_MB || 'Unknown';
-        const deploymentMessage = (process.env.DEPLOYMENT_MESSAGE || '').replace(/\\n/g, '\n');
-        const githubReleaseUrl = process.env.GITHUB_RELEASE_URL || '';
-        const buildZipPath = process.env.BUILD_ZIP_PATH || '';
         
         const payload = {
           text: `Hello Elementor v${packageVersion} Released!`,
@@ -81,7 +33,7 @@ runs:
               type: 'header',
               text: {
                 type: 'plain_text',
-                text: `🚀 Hello Elementor v${packageVersion} Released!`
+                text: `Hello Elementor v${packageVersion} Released!`
               }
             },
             {
@@ -97,40 +49,6 @@ runs:
                 {
                   type: 'mrkdwn',
                   text: `*Version:*\nv${packageVersion}`
-                },
-                {
-                  type: 'mrkdwn',
-                  text: `*Package Size:*\n${fileSizeMb}`
-                }
-              ]
-            },
-            {
-              type: 'section',
-              text: {
-                type: 'mrkdwn',
-                text: deploymentMessage
-              }
-            },
-            {
-              type: 'actions',
-              elements: [
-                {
-                  type: 'button',
-                  text: {
-                    type: 'plain_text',
-                    text: '📥 Download Release'
-                  },
-                  url: githubReleaseUrl,
-                  style: 'primary'
-                }
-              ]
-            },
-            {
-              type: 'context',
-              elements: [
-                {
-                  type: 'mrkdwn',
-                  text: `Build: ${buildZipPath}`
                 }
               ]
             }
@@ -151,15 +69,3 @@ runs:
         echo "📢 Slack notification sent!"
         echo "   - Channel: ${{ inputs.SLACK_CHANNEL }}"
         echo "   - Version: v${{ inputs.PACKAGE_VERSION }}"
-        echo "   - Release: ${{ inputs.GITHUB_RELEASE_URL }}"
-        case "${{ inputs.WPORG_DEPLOYMENT_STATUS }}" in
-          "deployed")
-            echo "   - WordPress.org: ✅ Automatically deployed"
-            ;;
-          "disabled")
-            echo "   - WordPress.org: ⚠️ Disabled in configuration"
-            ;;
-          *)
-            echo "   - WordPress.org: ⚠️ Skipped (deploy_to_wporg: false)"
-            ;;
-        esac

.github/config/release.json

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -eo pipefail
+
+PR_NUMBER="$1"
+TARGET="$2"
+ORIGINAL_BRANCH="$3"
+
+CLEAN_BRANCH=$(echo "$ORIGINAL_BRANCH" | sed 's|^[^/]*/||g')
+SANITIZED_BRANCH=$(echo "$CLEAN_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-\|-$//g')
+SANITIZED_BRANCH=${SANITIZED_BRANCH:0:35}
+TIMESTAMP=$(date +%s)
+BRANCH="${SANITIZED_BRANCH}-cherry-pick-pr${PR_NUMBER}-${TIMESTAMP}"
+
+echo "$BRANCH"
+

.github/scripts/cherry-picking/generate-branch-name.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eo pipefail
+
+PR_TITLE="$1"
+PR_NUMBER="$2"
+TARGET="$3"
+
+PR_TICKETS=$(echo "$PR_TITLE" | grep -o '\[[A-Z]\{2,\}-[0-9]\+\]' | tr '\n' ' ' | sed 's/[[:space:]]*$//')
+
+if [ -n "$PR_TICKETS" ]; then
+  TITLE_WITHOUT_TICKETS=$(echo "$PR_TITLE" | sed 's/\[[A-Z]\{2,\}-[0-9]\+\]//g' | sed 's/[[:space:]]*$//')
+  CHERRY_PICK_TITLE="$TITLE_WITHOUT_TICKETS (CP #${PR_NUMBER}→${TARGET}) ${PR_TICKETS}"
+else
+  CHERRY_PICK_TITLE="$PR_TITLE (CP #${PR_NUMBER}→${TARGET})"
+fi
+
+echo "$CHERRY_PICK_TITLE"
+

.github/scripts/cherry-picking/generate-pr-title.sh

@@ -1,7 +1,9 @@
 name: Build
 
-on: [push, pull_request]
-
+on:
+  push:
+  pull_request:
+  workflow_call:
 
 jobs:
   build_plugin:
@@ -41,24 +43,14 @@ jobs:
           echo "The Theme version is:"
           echo "${{ env.PACKAGE_VERSION }}"
           echo "The Theme slug is:"
-          echo "${{ env.THEME_SLUG }}"
+          echo "hello-elementor"
           echo "End debug Info"
           echo "exitcode=$?" >> $GITHUB_OUTPUT
       - name: Install Dependencies
         run: npm ci
       - name: Install Composer dependencies
         run:
           composer install --no-dev
-      - name: Bump version on push to release or develop
-        if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/release/') || github.ref == 'refs/heads/develop')
-        run: |
-          npm config set git-tag-version false
-          if [ "${GITHUB_REF:11}" == "develop" ];
-            then npm version patch
-          fi
-          if [[ "${GITHUB_REF:11:7}" == "release" ]];
-            then npm version minor
-          fi
       - name: Build
         run: npm run zip
       - name: Upload zip file to GitHub actions artifact