release: next version 📦

.changesets/20250312T150658-pr-16.md → .changesets/20250312T183946-pr-23.md

@@ -1,6 +1,6 @@
 ---
-title: "feat: add new emoji"
-pr: 16
+title: "feat: lightning emoji"
+pr: 23
 author: "jasonbahl"
 type: "feat"
 breaking: false

.github/workflows/generate-changeset.yml

@@ -41,7 +41,7 @@ jobs:
       contents: write
       pull-requests: write
     needs: [debug-event]
-    if: (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) || github.event_name == 'workflow_dispatch'
+    if: (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true && github.event.pull_request.base.ref != 'main') || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     env:
       REPO_URL: "https://github.com/${{ github.repository }}"

.github/workflows/release-management.yml

@@ -99,15 +99,23 @@ jobs:
       - name: Generate release notes
         id: release_notes
         run: |
-          # Extract changelog content for the current version
-          CHANGELOG_CONTENT=$(awk '/^## \['"${{ steps.version_bump.outputs.version }}"'\]/{flag=1; next} /^## \[/{flag=0} flag' CHANGELOG.md)
+          # Generate release notes directly using our script
+          npm run release:notes > release_notes.md
 
-          # Escape newlines for GitHub Actions
-          CHANGELOG_CONTENT="${CHANGELOG_CONTENT//'%'/'%25'}"
-          CHANGELOG_CONTENT="${CHANGELOG_CONTENT//$'\n'/'%0A'}"
-          CHANGELOG_CONTENT="${CHANGELOG_CONTENT//$'\r'/'%0D'}"
+          # For debugging
+          echo "Generated release notes:"
+          cat release_notes.md
 
-          echo "content=${CHANGELOG_CONTENT}" >> $GITHUB_OUTPUT
+          # Set the content for GitHub Actions output
+          # Properly escape the content for GitHub Actions
+          RELEASE_NOTES=$(cat release_notes.md)
+          RELEASE_NOTES="${RELEASE_NOTES//'%'/'%25'}"
+          RELEASE_NOTES="${RELEASE_NOTES//$'\n'/'%0A'}"
+          RELEASE_NOTES="${RELEASE_NOTES//$'\r'/'%0D'}"
+
+          echo "content<<EOF" >> $GITHUB_OUTPUT
+          echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Commit changes
         if: github.event_name != 'pull_request_target'
@@ -126,11 +134,16 @@ jobs:
           git config --global user.name "GitHub Actions"
           git config --global user.email "actions@github.com"
 
-          # Create an annotated tag with the changelog as the message
-          git tag -a "v${{ steps.version_bump.outputs.version }}" -m "Release v${{ steps.version_bump.outputs.version }}"
-
-          # Push the tag
-          git push origin "v${{ steps.version_bump.outputs.version }}"
+          # Check if tag already exists
+          if git rev-parse "v${{ steps.version_bump.outputs.version }}" >/dev/null 2>&1; then
+            echo "Tag v${{ steps.version_bump.outputs.version }} already exists. Skipping tag creation."
+          else
+            # Create an annotated tag with the changelog as the message
+            git tag -a "v${{ steps.version_bump.outputs.version }}" -m "Release v${{ steps.version_bump.outputs.version }}"
+
+            # Push the tag
+            git push origin "v${{ steps.version_bump.outputs.version }}"
+          fi
 
       - name: Create GitHub Release
         if: github.event_name == 'pull_request_target'
@@ -147,11 +160,31 @@ jobs:
       - name: Archive changesets
         if: github.event_name == 'pull_request_target'
         run: |
-          # Move all changesets to the archive directory
+          # Create archive directory if it doesn't exist
           mkdir -p .changesets/archive
-          find .changesets -maxdepth 1 -name "*.md" -type f -exec mv {} .changesets/archive/ \;
 
-          # Commit the archived changesets
-          git add .changesets/archive
-          git commit -m "chore: archive changesets for v${{ steps.version_bump.outputs.version }}"
-          git push origin main 
+          # Configure Git
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+          # Check if there are any changesets to archive
+          if [ -n "$(find .changesets -maxdepth 1 -name "*.md" -type f)" ]; then
+            # List all changesets before moving
+            echo "Changesets to archive:"
+            find .changesets -maxdepth 1 -name "*.md" -type f -exec basename {} \;
+
+            # Move each changeset individually and add to Git
+            for file in $(find .changesets -maxdepth 1 -name "*.md" -type f); do
+              filename=$(basename "$file")
+              echo "Moving $filename to archive"
+              git mv "$file" ".changesets/archive/$filename"
+            done
+
+            # Commit the archived changesets
+            git commit -m "chore: archive changesets for v${{ steps.version_bump.outputs.version }}"
+            git push origin main
+
+            echo "Archived changesets for v${{ steps.version_bump.outputs.version }}"
+          else
+            echo "No changesets found to archive"
+          fi 

automation-tests.php

@@ -14,7 +14,7 @@
 
 // show a message in the admin dashboard with the plugin name and version
 add_action( 'admin_notices', function() {
-	echo '<div class="notice notice-info"><p>⚽ Automation Tests v' . AUTOMATION_TESTS_VERSION . '</p></div>';
+	echo '<div class="notice notice-info"><p>⚡ Automation Tests v' . AUTOMATION_TESTS_VERSION . '</p></div>';
 });
 
 

scripts/generate-release-notes.js

@@ -53,17 +53,21 @@ function readChangesets() {
   const changesetDir = path.join(process.cwd(), '.changesets');
 
   if (!fs.existsSync(changesetDir)) {
-    console.error('No .changesets directory found.');
+    console.log('No .changesets directory found. Creating one...');
+    fs.mkdirSync(changesetDir, { recursive: true });
     return [];
   }
 
+  // Only read changesets from the main directory, not from the archive
   const changesetFiles = glob.sync('*.md', { cwd: changesetDir });
 
   if (changesetFiles.length === 0) {
     console.log('No changesets found.');
     return [];
   }
 
+  console.log(`Found ${changesetFiles.length} changesets.`);
+
   return changesetFiles.map(file => {
     const content = fs.readFileSync(path.join(changesetDir, file), 'utf8');
     const frontMatter = content.match(/---\n([\s\S]*?)\n---/);
@@ -76,9 +80,7 @@ function readChangesets() {
     try {
       // Parse the YAML-like front matter
       const lines = frontMatter[1].split('\n');
-      const changeset = {
-        file
-      };
+      const changeset = {};
 
       lines.forEach(line => {
         if (line.trim() === '' || line.startsWith('description:')) return;
@@ -90,6 +92,12 @@ function readChangesets() {
         changeset[key.trim()] = value.replace(/^"(.*)"$/, '$1');
       });
 
+      // Extract description
+      const descriptionMatch = content.match(/description: \|\n([\s\S]*?)(\n---|\n$)/);
+      if (descriptionMatch) {
+        changeset.description = descriptionMatch[1].trim();
+      }
+
       return changeset;
     } catch (err) {
       console.warn(`Error parsing changeset ${file}:`, err);