split workflow; checkout create-preview-links from trunk

Automattic · Apr 28, 2024 · 726f30a · 726f30a
1 parent 3acd95b
commit 726f30a
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 57 deletions.
diff --git a/.github/scripts/create-preview-links.js b/.github/scripts/create-preview-links.js
@@ -1,5 +1,3 @@
-const fs = require('fs');
-
 /*
  * This function creates a WordPress Playground blueprint JSON string for a theme.
  *
@@ -32,39 +30,6 @@ function createBlueprint(themeSlug, branch) {
 	return JSON.stringify(template);
 }
 
-/*
- * This function reads the `style.css` file of a theme and returns the theme name.
- *
- * @param {string} themeSlug - The slug of the theme to get the name of.
- * @returns {string} - The name of the theme as defined in the `style.css` file.
- */
-function getThemeName(themeSlug) {
-	const styleCss = fs.readFileSync(`${themeSlug}/style.css`, 'utf8');
-	const themeName = styleCss.match(/Theme Name:(.*)/i)[1].trim();
-	return themeName;
-}
-
-/*
- * This function reads the `style.css` file of a theme and returns the name of the parent theme.
- * If the theme is not a child theme, it returns an empty string.
- *
- * @param {string} themeSlug - The slug of the theme to get the parent theme name of.
- * @returns {string} - The name of the parent theme as defined in the `style.css` file.
- */
-function getParentThemeName(themeSlug) {
-	const styleCss = fs.readFileSync(`${themeSlug}/style.css`, 'utf8');
-	const parentTheme = styleCss.match(/Template:(.*)/i);
-	const isChildTheme = parentTheme && '' !== parentTheme[1].trim();
-
-	if (!isChildTheme) {
-		return '';
-	}
-
-	return parentTheme && '' !== parentTheme[1].trim()
-		? parentTheme[1].trim()
-		: '';
-}
-
 /*
  * This function creates a comment on a PR with preview links for the changed themes.
  * It is used by `preview-theme` workflow.
@@ -76,28 +41,21 @@ function getParentThemeName(themeSlug) {
 async function createPreviewLinksComment(github, context, changedThemeSlugs) {
 	const changedThemes = changedThemeSlugs.split(' ');
 	const previewLinks = changedThemes
-		.map((themeSlug) => {
-			const parentThemeName = getParentThemeName(themeSlug);
-			const note = parentThemeName
-				? ` (child theme of **${parentThemeName}**)`
-				: '';
-
-			return `- [Preview changes for **${getThemeName(
-				themeSlug
-			)}**](https://playground.wordpress.net/#${createBlueprint(
+		.map((theme) => {
+			const [themeName, themeDir] = theme.split(':');
+			const themeSlug = themeDir.split('/')[0];
+			return `- [Preview changes for **${themeName}**](https://playground.wordpress.net/#${createBlueprint(
 				themeSlug,
 				context.payload.pull_request.head.ref
-			)})${note}`;
+			)})`;
 		})
 		.join('\n');
 
-	const includesChildThemes = changedThemes.some(
-		(themeSlug) => '' !== getParentThemeName(themeSlug)
-	);
+	const includesChildThemes = previewLinks.includes('Child of');
 
 	const comment = `
 I've detected changes to the following themes in this PR: ${changedThemes
-		.map((themeSlug) => getThemeName(themeSlug))
+		.map((changedThemes) => changedThemes.split(':')[0])
 		.join(', ')}.
 
 You can preview these changes by following the links below:

diff --git a/.github/workflows/preview-theme.yml b/.github/workflows/preview-theme.yml
@@ -1,12 +1,17 @@
 name: Preview Theme Changes
 
 on:
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize]
+permissions:
+  pull-requests: write
 
 jobs:
   check-for-changes-to-themes:
     runs-on: ubuntu-latest
+    outputs:
+      HAS_THEME_CHANGES: ${{ steps.check-for-changes.outputs.HAS_THEME_CHANGES }}
+      CHANGED_THEMES: ${{ steps.check-for-changes.outputs.CHANGED_THEMES }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -25,9 +30,14 @@ jobs:
           for file in $changed_files; do
             dir_name=$(dirname "$file")
             while [[ "$dir_name" != "." ]]; do
-              if [[ -f "$dir_name/style.css" ]]; then  # Check if the parent directory contains a theme
-                # Save only the basename
-                unique_dirs[$dir_name]=$(basename $dir_name)
+              if [[ -f "$dir_name/style.css" ]]; then 
+                # Get theme name from style.css
+                theme_name=$(grep -m 1 "Theme Name:" "$dir_name/style.css" | sed 's/Theme Name: //')
+                parent_theme=$(grep -m 1 "Template:" "${unique_dirs[$theme]}/style.css" | sed 's/Template: //')
+                # Append parent theme to the theme name if it exists
+                [ -n "$parent_theme" ] && theme_name="$theme (Child of $parent_theme)"
+                # Store theme name and directory in associative array
+                unique_dirs["$theme_name"]=$dir_name
                 break
               fi
               dir_name=$(dirname "$dir_name")
@@ -41,21 +51,44 @@ jobs:
           fi
           # Output list of theme slugs with changes
           echo "HAS_THEME_CHANGES=true" >> $GITHUB_OUTPUT
-          echo "CHANGED_THEMES=$(echo ${unique_dirs[@]})" >> $GITHUB_ENV
+
+          # Serialize associative array of theme dirs to a string
+          declare -A CHANGED_THEMES
+          for theme in "${!unique_dirs[@]}"; do
+              # Append each entry as key:value,
+              CHANGED_THEMES+="$theme:${unique_dirs[$theme]},"
+          done
+          # Remove the last comma for correct JSON formatting
+          CHANGED_THEMES=${CHANGED_THEMES%,}
+          echo "CHANGED_THEMES=$CHANGED_THEMES" >> $GITHUB_OUTPUT
+
           echo "Theme directories with changes: $CHANGED_THEMES"
+  
+  handle-pr-comment:
+    runs-on: ubuntu-latest
+    needs: check-for-changes-to-themes
+    steps:
+      - name: Checkout create-preview-links script from trunk
+        uses: actions/checkout@v3
+        with:
+          repository: Automattic/themes
+          sparse-checkout: .github/scripts/create-preview-links
+          ref: workflow-security-issue
 
       - name: Add Preview Links comment
         id: comment-on-pr
-        if: ${{ steps.check-for-changes.outputs.HAS_THEME_CHANGES == 'true' }}
+        if: ${{ needs.check-for-changes-to-themes.outputs.HAS_THEME_CHANGES == 'true' }}
         uses: actions/github-script@v7
+        env:
+          CHANGED_THEMES: ${{ needs.check-for-changes-to-themes.outputs.CHANGED_THEMES }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const createPreviewLinks = require('.github/scripts/create-preview-links');
             createPreviewLinks(github, context, process.env.CHANGED_THEMES);
 
       - name: Remove comment if no changes are detected
-        if: ${{ steps.check-for-changes.outputs.HAS_THEME_CHANGES == 'false' }}
+        if: ${{ needs.check-for-changes-to-themes.outputs.HAS_THEME_CHANGES == 'false' }}
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -75,4 +108,4 @@ jobs:
                 repo: context.repo.repo
               });
             }
- 
+  
diff --git a/adventurer/patterns/404.php b/adventurer/patterns/404.php
@@ -13,6 +13,7 @@
     <h1 class="wp-block-heading alignwide has-text-align-left" id="oops-that-page-can-t-be-found" style="font-size:4.4rem"><?php echo esc_html__( 'Oops! That page can&rsquo;t be found.', 'adventurer' ); ?></h1>
     <!-- /wp:heading -->
 
+
     <!-- wp:paragraph -->
     <p><?php echo  esc_html__( 'It looks like nothing was found at this location. Maybe try a search?', 'adventurer' ); ?></p>
     <!-- /wp:paragraph -->