Script udpated

Author: shewa12

.github/workflows/build-and-deploy.yml

@@ -2,7 +2,7 @@ name: Build and Deploy WordPress Theme
 
 on:
   push:
-    brances:
+    branches:
       - 'shewa'
 
   workflow_dispatch:
@@ -11,9 +11,6 @@ env:
   DRY_RUN: 'true'
 
 jobs:
-  # ────────────────────────────────────────────────────────────
-  # JOB 1 — Build
-  # ────────────────────────────────────────────────────────────
   build:
     name: 'Build Theme'
     runs-on: ubuntu-latest
@@ -24,19 +21,15 @@ jobs:
       zip_path: ${{ steps.meta.outputs.zip_path }}
 
     steps:
-      # 1. Checkout code -------------------------------------------------
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0          # full history so git describe works
+          fetch-depth: 0
 
-      # 2. Extract version from style.css --------------------------------
       - name: Extract version from style.css
         id: meta
         shell: bash
         run: |
-          # Pull the "Version:" header from the WP theme file header block.
-          # e.g.  Version: 1.4.2
           RAW=$(grep -m1 -E '^[[:space:]]*\*?[[:space:]]*Version[[:space:]]*:[[:space:]]*' style.css \
                   | sed -E 's/.*Version[[:space:]]*:[[:space:]]*//' \
                   | tr -d '[:space:]')
@@ -49,69 +42,58 @@ jobs:
           ZIP_NAME="tutorstarter-${RAW}.zip"
           ZIP_PATH="${GITHUB_WORKSPACE}/${ZIP_NAME}"
 
-          echo "Detected theme version: ${RAW}"
-          echo "version=${RAW}"    >> "$GITHUB_OUTPUT"
+          echo "version=${RAW}" >> "$GITHUB_OUTPUT"
           echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
-          echo "zip_path=${ZIP_PATH}"  >> "$GITHUB_OUTPUT"
+          echo "zip_path=${ZIP_PATH}" >> "$GITHUB_OUTPUT"
 
-      # 3. Install PHP & Composer ----------------------------------------
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
           tools: composer:v2
           coverage: none
 
-      # 4. Install WP-CLI ------------------------------------------------
       - name: Install WP-CLI
-        shell: bash
         run: |
-          curl -sS -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+          curl -sS -o /usr/local/bin/wp https://github.com/wp-cli/wp-cli/releases/download/v2.13.0/wp-cli-2.13.0.phar
           chmod +x /usr/local/bin/wp
           wp --version --allow-root
 
       - name: Install dist-archive command
-        shell: bash
-        run: composer require wp-cli/dist-archive-command:^2.0
+        run: |
+          composer global require wp-cli/dist-archive-command:^3.0
+          echo "$HOME/.composer/vendor/bin" >> $GITHUB_PATH
 
-      # 5. Set up Node.js ------------------------------------------------
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
 
-      # 6. Install npm dependencies ----------------------------------------
       - name: Install npm dependencies
-        run: npm i
+        run: npm ci
 
-      # 7. Build theme assets ---------------------------------------------------
-      # Runs: composer i --no-dev && npm run production && npm run makepot && npm run bundle
       - name: Build theme assets
-        run: npm run build
+        run: 
+          npm run build
+          composer i --no-dev
+          npm run production
+          npm run makepot
         env:
           NODE_ENV: production
           NODE_OPTIONS: --openssl-legacy-provider
 
-      # 6. Verify the zip was produced ------------------------------------
-      - name: Verify zip artifact
-        id: verify_zip
-        shell: bash
+      - name: Build theme zip
         run: |
-          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
-          ZIP_PATH="${{ steps.meta.outputs.zip_path }}"
+          wp dist-archive . "${{ steps.meta.outputs.zip_path }}" --allow-root
 
-          if [[ ! -f "$ZIP_PATH" ]]; then
-            echo "::error::Expected zip not found at ${ZIP_PATH}"
-            echo "Files in workspace root:"
-            ls -lh "${GITHUB_WORKSPACE}"/*.zip 2>/dev/null || echo "(no zips found)"
+      - name: Verify zip artifact
+        run: |
+          if [[ ! -f "${{ steps.meta.outputs.zip_path }}" ]]; then
+            echo "::error::Zip not found"
             exit 1
           fi
 
-          SIZE=$(du -sh "$ZIP_PATH" | cut -f1)
-          echo "✅  Found ${ZIP_NAME} (${SIZE})"
-
-      # 7. Upload zip as workflow artifact so next jobs can use it --------
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
@@ -120,224 +102,89 @@ jobs:
           retention-days: 1
           if-no-files-found: error
 
-  # ────────────────────────────────────────────────────────────
-  # JOB 2 — Deploy to WordPress.org SVN
-  # Skipped entirely when dry_run == 'true'
-  # ────────────────────────────────────────────────────────────
   deploy-wporg:
     name: 'Deploy to WordPress.org'
     runs-on: ubuntu-latest
     needs: build
-    if: ${{ github.event.inputs.dry_run != 'true' }}
+    if: ${{ env.DRY_RUN != 'true' }}
 
     env:
-      THEME_SLUG: tutorstarter        # WP.org theme slug
+      THEME_SLUG: tutorstarter
       THEME_VERSION: ${{ needs.build.outputs.version }}
-      ZIP_NAME:      ${{ needs.build.outputs.zip_name }}
-      SVN_BASE:      https://themes.svn.wordpress.org
+      ZIP_NAME: ${{ needs.build.outputs.zip_name }}
+      SVN_BASE: https://themes.svn.wordpress.org
 
     steps:
-      # 1. Install SVN ----------------------------------------------------
       - name: Install Subversion
         run: |
           sudo apt-get update -q
           sudo apt-get install -y subversion
 
-      # 2. Download the zip built in job 1 --------------------------------
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
           name: theme-zip
           path: /tmp/build
 
-      # 3. Checkout WP.org SVN (trunk only, no full history) --------------
       - name: Checkout SVN trunk
-        shell: bash
         run: |
           SVN_URL="${SVN_BASE}/${THEME_SLUG}"
-          echo "Checking out SVN: ${SVN_URL}"
-          svn checkout \
-            --depth immediates \
+          svn checkout --depth immediates \
             --username "${{ secrets.WPORG_SVN_USERNAME }}" \
             --password "${{ secrets.WPORG_SVN_PASSWORD }}" \
-            --no-auth-cache \
-            --non-interactive \
+            --no-auth-cache --non-interactive \
             "${SVN_URL}" /tmp/svn
-          # Deepen trunk for a full working copy
+
           svn update /tmp/svn/trunk --set-depth infinity \
             --username "${{ secrets.WPORG_SVN_USERNAME }}" \
             --password "${{ secrets.WPORG_SVN_PASSWORD }}" \
-            --no-auth-cache \
-            --non-interactive
+            --no-auth-cache --non-interactive
 
-      # 4. Unzip theme into a staging directory ---------------------------
       - name: Unzip theme
-        shell: bash
         run: |
-          mkdir -p /tmp/theme-extracted
-          unzip -q "/tmp/build/${ZIP_NAME}" -d /tmp/theme-extracted
-
-          # The zip may contain a sub-folder named after the theme; normalise.
-          INNER=$(ls /tmp/theme-extracted)
-          if [[ $(echo "$INNER" | wc -l) -eq 1 && -d "/tmp/theme-extracted/${INNER}" ]]; then
-            mv "/tmp/theme-extracted/${INNER}" /tmp/theme-files
-          else
-            mv /tmp/theme-extracted /tmp/theme-files
-          fi
+          mkdir -p /tmp/theme-files
+          unzip -q "/tmp/build/${ZIP_NAME}" -d /tmp/theme-files
 
-      # 5. Sync files into SVN trunk -------------------------------------
       - name: Sync theme files to SVN trunk
-        shell: bash
         run: |
           TRUNK=/tmp/svn/trunk
-
-          # Remove everything currently in trunk
           find "$TRUNK" -mindepth 1 -delete
-
-          # Copy fresh build
           cp -r /tmp/theme-files/. "$TRUNK/"
 
-          # Stage additions and deletions
-          svn status "$TRUNK" | grep '^?' | awk '{print $2}' | \
-            xargs -r svn add --force --no-auto-props
-          svn status "$TRUNK" | grep '^!' | awk '{print $2}' | \
-            xargs -r svn delete
-
-      # 6. Create a versioned tag in SVN ----------------------------------
-      - name: Create SVN tag
-        shell: bash
-        run: |
-          TAGS_URL="${SVN_BASE}/${THEME_SLUG}/tags/${THEME_VERSION}"
-          TRUNK_URL="${SVN_BASE}/${THEME_SLUG}/trunk"
-
-          # Check if tag already exists
-          if svn info "$TAGS_URL" \
-              --username "${{ secrets.WPORG_SVN_USERNAME }}" \
-              --password "${{ secrets.WPORG_SVN_PASSWORD }}" \
-              --no-auth-cache --non-interactive 2>/dev/null; then
-            echo "::warning::SVN tag ${THEME_VERSION} already exists — skipping tag creation."
-          else
-            svn copy "$TRUNK_URL" "$TAGS_URL" \
-              --username "${{ secrets.WPORG_SVN_USERNAME }}" \
-              --password "${{ secrets.WPORG_SVN_PASSWORD }}" \
-              --no-auth-cache \
-              --non-interactive \
-              -m "Tagging version ${THEME_VERSION}"
-          fi
+          svn status "$TRUNK" | grep '^?' | awk '{print $2}' | xargs -r svn add --force
+          svn status "$TRUNK" | grep '^!' | awk '{print $2}' | xargs -r svn delete
 
-      # 7. Commit trunk ---------------------------------------------------
       - name: Commit to SVN trunk
-        shell: bash
         run: |
           svn commit /tmp/svn/trunk \
             --username "${{ secrets.WPORG_SVN_USERNAME }}" \
             --password "${{ secrets.WPORG_SVN_PASSWORD }}" \
-            --no-auth-cache \
-            --non-interactive \
+            --no-auth-cache --non-interactive \
             -m "Deploy version ${THEME_VERSION}"
 
-  # ────────────────────────────────────────────────────────────
-  # JOB 3 — Create GitHub Release
-  # Runs after build (and after deploy when not a dry-run)
-  # ────────────────────────────────────────────────────────────
   release:
     name: 'Create GitHub Release'
     runs-on: ubuntu-latest
     needs: [build, deploy-wporg]
-    # Always run this job even if deploy-wporg was skipped (dry-run case)
     if: always() && needs.build.result == 'success'
 
     env:
       VERSION:  ${{ needs.build.outputs.version }}
       ZIP_NAME: ${{ needs.build.outputs.zip_name }}
-      IS_DRY:   ${{ github.event.inputs.dry_run || 'false' }}
 
     steps:
-      # 1. Download the zip -----------------------------------------------
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
           name: theme-zip
           path: /tmp/release
 
-      # 2. Resolve the Git tag name ---------------------------------------
-      #    For tag-push events: use the pushed tag.
-      #    For manual (workflow_dispatch) runs: derive from version.
-      - name: Resolve release tag
-        id: tag
-        shell: bash
-        run: |
-          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
-            TAG_NAME="${GITHUB_REF_NAME}"
-          else
-            TAG_NAME="v${VERSION}"
-          fi
-          echo "tag_name=${TAG_NAME}" >> "$GITHUB_OUTPUT"
-
-      # 3. Build release notes --------------------------------------------
-      - name: Build release notes
-        id: notes
-        shell: bash
-        run: |
-          DRY_LABEL=""
-          if [[ "${IS_DRY}" == "true" ]]; then
-            DRY_LABEL=" [DRY RUN — WP.org deploy skipped]"
-          fi
-
-          NOTES=$(cat <<EOF
-          ## TutorStarter ${VERSION}${DRY_LABEL}
-
-          **Theme Version:** \`${VERSION}\`
-          **Build triggered by:** \`${GITHUB_ACTOR}\`
-          **Workflow run:** [#${GITHUB_RUN_NUMBER}](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})
-
-          ### Installation
-          Download \`${ZIP_NAME}\` below and upload it via **Appearance → Themes → Add New → Upload Theme** in your WordPress dashboard.
-          EOF
-          )
-
-          # Write to a file to avoid shell-escaping issues in later steps
-          echo "$NOTES" > /tmp/release_notes.md
-          echo "notes_file=/tmp/release_notes.md" >> "$GITHUB_OUTPUT"
-
-      # 4. Create (or update) the GitHub release -------------------------
       - name: Create GitHub Release
-        shell: bash
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          TAG="${{ steps.tag.outputs.tag_name }}"
-          ASSET="/tmp/release/${ZIP_NAME}"
-          NOTES_FILE="${{ steps.notes.outputs.notes_file }}"
-
-          # Create or overwrite an existing draft/release for this tag
+          TAG="v${VERSION}"
           gh release create "$TAG" \
-            --repo "${GITHUB_REPOSITORY}" \
             --title "TutorStarter ${VERSION}" \
-            --notes-file "$NOTES_FILE" \
-            --draft=false \
-            --latest \
-            "$ASSET" \
-          || gh release upload "$TAG" "$ASSET" \
-              --repo "${GITHUB_REPOSITORY}" \
-              --clobber
-
-          echo "✅  GitHub release ${TAG} created/updated."
-
-      # 5. Print summary to Actions UI ------------------------------------
-      - name: Write job summary
-        shell: bash
-        run: |
-          echo "## 🚀 Build & Deploy Summary" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "| Field | Value |" >> "$GITHUB_STEP_SUMMARY"
-          echo "|---|---|" >> "$GITHUB_STEP_SUMMARY"
-          echo "| Theme version | \`${VERSION}\` |" >> "$GITHUB_STEP_SUMMARY"
-          echo "| Zip artifact  | \`${ZIP_NAME}\` |" >> "$GITHUB_STEP_SUMMARY"
-          echo "| Git tag       | \`${{ steps.tag.outputs.tag_name }}\` |" >> "$GITHUB_STEP_SUMMARY"
-          if [[ "${IS_DRY}" == "true" ]]; then
-            echo "| WP.org deploy | ⏭️ **Skipped (dry run)** |" >> "$GITHUB_STEP_SUMMARY"
-          else
-            echo "| WP.org deploy | ✅ Completed |" >> "$GITHUB_STEP_SUMMARY"
-          fi
-          echo "| GitHub release | ✅ Published |" >> "$GITHUB_STEP_SUMMARY"
+            "/tmp/release/${ZIP_NAME}" \
+          || gh release upload "$TAG" "/tmp/release/${ZIP_NAME}" --clobber