Fix release smoke gating

Author: alexphillips-dev

.github/workflows/release-main.yml

@@ -56,15 +56,15 @@ jobs:
           FVPLUS_REQUIRE_PERF_BASELINE: '1'
           FVPLUS_MAIN_HISTORY_BASE_REF: ${{ github.event.before }}
           FVPLUS_BROWSER_SMOKE_URL: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL }}
-          FVPLUS_BROWSER_SMOKE_REQUIRED: '1'
+          FVPLUS_BROWSER_SMOKE_REQUIRED: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL != '' && '1' || '0' }}
           FVPLUS_BROWSER_SMOKE_TIMEOUT_MS: '90000'
           FVPLUS_BROWSER_SMOKE_IGNORE_HTTPS: '1'
           FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR: '1'
           FVPLUS_BROWSER_SMOKE_REQUIRE_RUNTIME_ROWS: '1'
           FVPLUS_BROWSER_SMOKE_RUNTIME_GAP_MAX: '30'
           FVPLUS_BROWSER_SMOKE_ARTIFACT_DIR: ${{ github.workspace }}/tmp/browser-smoke-artifacts
           FVPLUS_THEME_MATRIX_URLS: ${{ secrets.FVPLUS_THEME_MATRIX_URLS }}
-          FVPLUS_THEME_MATRIX_REQUIRED: '1'
+          FVPLUS_THEME_MATRIX_REQUIRED: ${{ secrets.FVPLUS_THEME_MATRIX_URLS != '' && '1' || '0' }}
           FVPLUS_THEME_REQUIRED_LABELS: 'black,white'
           FVPLUS_THEME_SMOKE_TIMEOUT_MS: '90000'
           FVPLUS_THEME_SMOKE_IGNORE_HTTPS: '1'

.github/workflows/release-on-main.yml

@@ -99,15 +99,15 @@ jobs:
           FVPLUS_REQUIRE_PERF_BASELINE: '1'
           FVPLUS_MAIN_HISTORY_BASE_REF: ${{ github.event.before }}
           FVPLUS_BROWSER_SMOKE_URL: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL }}
-          FVPLUS_BROWSER_SMOKE_REQUIRED: '1'
+          FVPLUS_BROWSER_SMOKE_REQUIRED: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL != '' && '1' || '0' }}
           FVPLUS_BROWSER_SMOKE_TIMEOUT_MS: '90000'
           FVPLUS_BROWSER_SMOKE_IGNORE_HTTPS: '1'
           FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR: '1'
           FVPLUS_BROWSER_SMOKE_REQUIRE_RUNTIME_ROWS: '1'
           FVPLUS_BROWSER_SMOKE_RUNTIME_GAP_MAX: '30'
           FVPLUS_BROWSER_SMOKE_ARTIFACT_DIR: ${{ github.workspace }}/tmp/browser-smoke-artifacts
           FVPLUS_THEME_MATRIX_URLS: ${{ secrets.FVPLUS_THEME_MATRIX_URLS }}
-          FVPLUS_THEME_MATRIX_REQUIRED: '1'
+          FVPLUS_THEME_MATRIX_REQUIRED: ${{ secrets.FVPLUS_THEME_MATRIX_URLS != '' && '1' || '0' }}
           FVPLUS_THEME_REQUIRED_LABELS: 'black,white'
           FVPLUS_THEME_SMOKE_TIMEOUT_MS: '90000'
           FVPLUS_THEME_SMOKE_IGNORE_HTTPS: '1'

scripts/workflow_self_check.sh

@@ -67,6 +67,14 @@ if (!/ci-duration-report/.test(ciWorkflow)) {
 if (!/bash scripts\/build_release_notes\.sh/.test(releaseOnMainWorkflow)) {
   fail('Release On Main workflow must build release notes via scripts/build_release_notes.sh.');
 }
+if (!/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL != '' && '1' \|\| '0'\s*\}\}/.test(releaseMainWorkflow) ||
+    !/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL != '' && '1' \|\| '0'\s*\}\}/.test(releaseOnMainWorkflow)) {
+  fail('Release workflows must gate browser smoke enforcement on FVPLUS_BROWSER_SMOKE_URL being configured.');
+}
+if (!/FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS != '' && '1' \|\| '0'\s*\}\}/.test(releaseMainWorkflow) ||
+    !/FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS != '' && '1' \|\| '0'\s*\}\}/.test(releaseOnMainWorkflow)) {
+  fail('Release workflows must gate theme matrix enforcement on FVPLUS_THEME_MATRIX_URLS being configured.');
+}
 if (!/Detect release artifact changes/.test(releaseOnMainWorkflow)) {
   fail('Release On Main workflow must detect whether a main push actually changed release artifacts.');
 }

tests/versioning-guard.test.mjs

@@ -343,8 +343,8 @@ test('validation workflows delegate to the shared ci suite with dev coverage, fa
         assert.match(workflow, /uses:\s*\.\/\.github\/actions\/setup-ci-env/);
         assert.match(workflow, /Run release validation suite/);
         assert.match(workflow, /bash scripts\/run_ci_suite\.sh --release/);
-        assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRED:\s*'1'/);
-        assert.match(workflow, /FVPLUS_THEME_MATRIX_REQUIRED:\s*'1'/);
+        assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL != '' && '1' \|\| '0'\s*\}\}/);
+        assert.match(workflow, /FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS != '' && '1' \|\| '0'\s*\}\}/);
         assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR:\s*'1'/);
         assert.match(workflow, /FVPLUS_THEME_REQUIRED_LABELS:\s*'black,white'/);
     }