Merge pull request #358 from emulsify-ds/codex-add-attributes-helper-cleanup

feat: refine git actions tests

Author: callinmullaney

.github/scripts/release-check.cjs

@@ -202,9 +202,9 @@ function runStaticChecks() {
     ensure(extractYamlDependencyConstraint(emulsifyInfo, 'emulsify_tools') === composer.require['drupal/emulsify_tools'], 'emulsify.info.yml must match the composer emulsify_tools constraint.');
     ensure(extractYamlDependencyConstraint(whiskInfo, 'emulsify_tools') === composer.require['drupal/emulsify_tools'], 'whisk.info.yml must match the composer emulsify_tools constraint.');
     ensure(extractYamlDependencyConstraint(whiskInfoStarter, 'emulsify_tools') === composer.require['drupal/emulsify_tools'], 'whisk.info.emulsify.yml must match the composer emulsify_tools constraint.');
-    ensure(themeReadinessWorkflow.includes(`- '${minCoreVersion}.*'`), 'theme-readiness.yml should smoke test the supported Drupal patch line.');
-    ensure(themeReadinessWorkflow.includes(`- '^${minCoreVersion}'`), 'theme-readiness.yml should smoke test the supported Drupal constraint.');
-    return `Root theme metadata and CI matrix align to Drupal ${minCoreVersion}.`;
+    ensure(themeReadinessWorkflow.includes(`DRUPAL_VERSION: '${minCoreVersion}.*'`), 'theme-readiness.yml should smoke test the supported Drupal patch line.');
+    ensure(themeReadinessWorkflow.includes("PHP_VERSION: '8.4'"), 'theme-readiness.yml should run readiness smoke checks on PHP 8.4.');
+    return `Root theme metadata and CI readiness checks align to Drupal ${minCoreVersion} on PHP 8.4.`;
   });
 
   runStaticCheck('Package metadata', () => {
@@ -274,19 +274,18 @@ function runStaticChecks() {
 function runSmokeChecks() {
   if (options.skipSmoke) {
     addResult('SKIP', 'Stable9 template parity', 'Skipped with --skip-smoke.');
+    addResult('SKIP', 'Base theme render smoke', 'Skipped with --skip-smoke.');
     addResult('SKIP', 'Generated theme smoke test', 'Skipped with --skip-smoke.');
-    addResult('SKIP', 'No-Stable9 smoke result', 'Skipped with --skip-smoke.');
     addResult('SKIP', 'Favicon generation', 'Skipped with --skip-smoke.');
     return;
   }
 
   const smokeRoot = options.workDir;
   const baseFixture = path.join(smokeRoot, 'base-fixture');
   const generatedThemeFixture = path.join(smokeRoot, 'generated-theme-fixture');
-  const noStable9Fixture = path.join(smokeRoot, 'no-stable9-fixture');
   const faviconFixture = path.join(smokeRoot, 'favicon-fixture');
+  const baseThemeOutput = path.join(smokeRoot, 'base-theme-output');
   const generatedThemeOutput = path.join(smokeRoot, 'generated-theme-output');
-  const noStable9Output = path.join(smokeRoot, 'no-stable9-output');
 
   fs.rmSync(smokeRoot, { force: true, recursive: true });
   fs.mkdirSync(smokeRoot, { recursive: true });
@@ -304,8 +303,8 @@ function runSmokeChecks() {
 
   if (setupResult.status !== 0) {
     addResult('FAIL', 'Stable9 template parity', 'Unable to build the Drupal fixture site for template parity checks.');
+    addResult('FAIL', 'Base theme render smoke', 'Unable to build the Drupal fixture site for smoke testing.');
     addResult('FAIL', 'Generated theme smoke test', 'Unable to build the Drupal fixture site for smoke testing.');
-    addResult('FAIL', 'No-Stable9 smoke result', 'Unable to build the Drupal fixture site for smoke testing.');
     addResult('FAIL', 'Favicon generation', 'Unable to build the Drupal fixture site for smoke testing.');
     return;
   }
@@ -318,25 +317,21 @@ function runSmokeChecks() {
     { passMessage: 'Verified that Emulsify ships every stable9 template path without inheriting from stable9.' },
   );
 
-  copyDirectory(baseFixture, generatedThemeFixture);
   runSmokeCheck(
-    'Generated theme smoke test',
+    'Base theme render smoke',
     'bash',
-    [path.join(repoRoot, '.github/scripts/starterkit-smoke.sh'), generatedThemeFixture, generatedThemeOutput],
+    [path.join(repoRoot, '.github/scripts/render-reference-pages.sh'), baseFixture, baseThemeOutput],
     repoRoot,
-    { passMessage: `Starterkit generation and generated theme smoke passed on Drupal ${options.drupalVersion}.` },
+    { passMessage: 'Base theme pages rendered successfully on the fixture site.' },
   );
 
-  copyDirectory(baseFixture, noStable9Fixture);
+  copyDirectory(baseFixture, generatedThemeFixture);
   runSmokeCheck(
-    'No-Stable9 smoke result',
+    'Generated theme smoke test',
     'bash',
-    [path.join(repoRoot, '.github/scripts/smoke-without-stable9.sh'), noStable9Fixture, noStable9Output],
+    [path.join(repoRoot, '.github/scripts/starterkit-smoke.sh'), generatedThemeFixture, generatedThemeOutput],
     repoRoot,
-    {
-      passMessage: 'Smoke test passed without any stable9 base theme dependency.',
-      failMessage: 'Smoke test failed without the stable9 base theme dependency.',
-    },
+    { passMessage: `Starterkit generation and generated theme smoke passed on Drupal ${options.drupalVersion}.` },
   );
 
   copyDirectory(baseFixture, faviconFixture);

.github/scripts/setup-fixture-site.sh

@@ -11,6 +11,10 @@ drupal_version="$1"
 fixture_dir="$2"
 theme_source_dir="${3:-$(pwd)}"
 composer_bin="${COMPOSER_BIN:-composer}"
+emulsify_tools_repo="${EMULSIFY_TOOLS_REPOSITORY:-https://github.com/emulsify-ds/emulsify_tools.git}"
+emulsify_tools_ref="${EMULSIFY_TOOLS_REF:-release-2}"
+theme_dir="${fixture_dir}/web/themes/contrib/emulsify"
+emulsify_tools_dir="${fixture_dir}/web/modules/contrib/emulsify_tools"
 
 export COMPOSER_MEMORY_LIMIT=-1
 
@@ -22,8 +26,20 @@ rm -rf "$fixture_dir"
 
 cd "$fixture_dir"
 
-"$composer_bin" config repositories.emulsify "{\"type\":\"path\",\"url\":\"${theme_source_dir}\",\"options\":{\"symlink\":false}}"
-"$composer_bin" require --no-interaction drush/drush:^13 emulsify-ds/emulsify-drupal:@dev
+mkdir -p "$(dirname "$theme_dir")" "$(dirname "$emulsify_tools_dir")"
+rsync -a \
+  --exclude '.git/' \
+  --exclude '.github/' \
+  --exclude 'node_modules/' \
+  --exclude 'vendor/' \
+  "${theme_source_dir}/" "${theme_dir}/"
+
+# Readiness checks should exercise the local theme code and the in-flight
+# Emulsify Tools 2.x branch instead of depending on a published package.
+git clone --depth 1 --branch "$emulsify_tools_ref" "$emulsify_tools_repo" "$emulsify_tools_dir"
+rm -rf "${emulsify_tools_dir}/.git"
+
+"$composer_bin" require --no-interaction drush/drush:^13
 
 ./vendor/bin/drush site:install standard \
   --db-url=sqlite://sites/default/files/.ht.sqlite \

.github/scripts/smoke-without-stable9.sh

@@ -8,78 +8,40 @@ on:
       - 6.x
   workflow_dispatch:
 
+concurrency:
+  group: theme-readiness-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  DRUPAL_VERSION: '11.3.*'
+  PHP_VERSION: '8.4'
+
 jobs:
-  template-parity:
-    name: Template Parity (${{ matrix.drupal-version }})
+  theme-readiness:
+    name: Theme Readiness
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        drupal-version:
-          - '11.3.*'
-          - '^11.3'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: ${{ env.PHP_VERSION }}
           tools: composer:v2
+          extensions: gd, imagick
 
       - name: Build fixture site
-        run: bash .github/scripts/setup-fixture-site.sh "${{ matrix.drupal-version }}" /tmp/emulsify-fixture "$GITHUB_WORKSPACE"
+        run: bash .github/scripts/setup-fixture-site.sh "${{ env.DRUPAL_VERSION }}" /tmp/emulsify-fixture "$GITHUB_WORKSPACE"
 
       - name: Verify Emulsify ships the full stable9 template surface
         run: bash .github/scripts/template-parity.sh /tmp/emulsify-fixture "$GITHUB_WORKSPACE"
 
-  no-stable9-readiness:
-    name: No Stable9 Readiness (${{ matrix.drupal-version }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        drupal-version:
-          - '11.3.*'
-          - '^11.3'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          tools: composer:v2
-
-      - name: Build fixture site
-        run: bash .github/scripts/setup-fixture-site.sh "${{ matrix.drupal-version }}" /tmp/emulsify-fixture "$GITHUB_WORKSPACE"
+      - name: Smoke test base theme page rendering
+        run: bash .github/scripts/render-reference-pages.sh /tmp/emulsify-fixture /tmp/emulsify-base-theme
 
-      - name: Smoke test without stable9 fallback
-        run: bash .github/scripts/smoke-without-stable9.sh /tmp/emulsify-fixture /tmp/emulsify-no-stable9
-
-  starterkit-generation:
-    name: Starterkit Smoke (${{ matrix.drupal-version }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        drupal-version:
-          - '11.3.*'
-          - '^11.3'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          tools: composer:v2
-
-      - name: Build fixture site
-        run: bash .github/scripts/setup-fixture-site.sh "${{ matrix.drupal-version }}" /tmp/emulsify-fixture "$GITHUB_WORKSPACE"
+      - name: Smoke test generated favicon package
+        run: bash .github/scripts/favicon-smoke.sh /tmp/emulsify-fixture emulsify
 
       - name: Generate and enable a Whisk-derived theme
         run: bash .github/scripts/starterkit-smoke.sh /tmp/emulsify-fixture /tmp/emulsify-generated-theme