Skip to content

Commit ceda432

Browse files
Gate release smoke checks on configured targets
1 parent 1f2581c commit ceda432

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/release-main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656
FVPLUS_REQUIRE_PERF_BASELINE: '1'
5757
FVPLUS_MAIN_HISTORY_BASE_REF: ${{ github.event.before }}
5858
FVPLUS_BROWSER_SMOKE_URL: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL }}
59-
FVPLUS_BROWSER_SMOKE_REQUIRED: '1'
59+
FVPLUS_BROWSER_SMOKE_REQUIRED: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL != '' && '1' || '0' }}
6060
FVPLUS_BROWSER_SMOKE_TIMEOUT_MS: '90000'
6161
FVPLUS_BROWSER_SMOKE_IGNORE_HTTPS: '1'
6262
FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR: '1'
6363
FVPLUS_BROWSER_SMOKE_REQUIRE_RUNTIME_ROWS: '1'
6464
FVPLUS_BROWSER_SMOKE_RUNTIME_GAP_MAX: '30'
6565
FVPLUS_BROWSER_SMOKE_ARTIFACT_DIR: ${{ github.workspace }}/tmp/browser-smoke-artifacts
6666
FVPLUS_THEME_MATRIX_URLS: ${{ secrets.FVPLUS_THEME_MATRIX_URLS }}
67-
FVPLUS_THEME_MATRIX_REQUIRED: '1'
67+
FVPLUS_THEME_MATRIX_REQUIRED: ${{ secrets.FVPLUS_THEME_MATRIX_URLS != '' && '1' || '0' }}
6868
FVPLUS_THEME_REQUIRED_LABELS: 'black,white'
6969
FVPLUS_THEME_SMOKE_TIMEOUT_MS: '90000'
7070
FVPLUS_THEME_SMOKE_IGNORE_HTTPS: '1'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ jobs:
104104
FVPLUS_REQUIRE_PERF_BASELINE: '1'
105105
FVPLUS_MAIN_HISTORY_BASE_REF: ${{ github.event.before }}
106106
FVPLUS_BROWSER_SMOKE_URL: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL }}
107-
FVPLUS_BROWSER_SMOKE_REQUIRED: '1'
107+
FVPLUS_BROWSER_SMOKE_REQUIRED: ${{ secrets.FVPLUS_BROWSER_SMOKE_URL != '' && '1' || '0' }}
108108
FVPLUS_BROWSER_SMOKE_TIMEOUT_MS: '90000'
109109
FVPLUS_BROWSER_SMOKE_IGNORE_HTTPS: '1'
110110
FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR: '1'
111111
FVPLUS_BROWSER_SMOKE_REQUIRE_RUNTIME_ROWS: '1'
112112
FVPLUS_BROWSER_SMOKE_RUNTIME_GAP_MAX: '30'
113113
FVPLUS_BROWSER_SMOKE_ARTIFACT_DIR: ${{ github.workspace }}/tmp/browser-smoke-artifacts
114114
FVPLUS_THEME_MATRIX_URLS: ${{ secrets.FVPLUS_THEME_MATRIX_URLS }}
115-
FVPLUS_THEME_MATRIX_REQUIRED: '1'
115+
FVPLUS_THEME_MATRIX_REQUIRED: ${{ secrets.FVPLUS_THEME_MATRIX_URLS != '' && '1' || '0' }}
116116
FVPLUS_THEME_REQUIRED_LABELS: 'black,white'
117117
FVPLUS_THEME_SMOKE_TIMEOUT_MS: '90000'
118118
FVPLUS_THEME_SMOKE_IGNORE_HTTPS: '1'

scripts/workflow_self_check.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ if (!/ci-duration-report/.test(ciWorkflow)) {
6767
if (!/bash scripts\/build_release_notes\.sh/.test(releaseOnMainWorkflow)) {
6868
fail('Release On Main workflow must build release notes via scripts/build_release_notes.sh.');
6969
}
70-
if (!/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*'1'/.test(releaseMainWorkflow) ||
71-
!/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*'1'/.test(releaseOnMainWorkflow)) {
72-
fail('Release workflows must require browser smoke coverage.');
70+
if (!/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/.test(releaseMainWorkflow) ||
71+
!/FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/.test(releaseOnMainWorkflow)) {
72+
fail('Release workflows must gate browser smoke coverage on configured target URLs.');
7373
}
74-
if (!/FVPLUS_THEME_MATRIX_REQUIRED:\s*'1'/.test(releaseMainWorkflow) ||
75-
!/FVPLUS_THEME_MATRIX_REQUIRED:\s*'1'/.test(releaseOnMainWorkflow)) {
76-
fail('Release workflows must require theme matrix smoke coverage.');
74+
if (!/FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/.test(releaseMainWorkflow) ||
75+
!/FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/.test(releaseOnMainWorkflow)) {
76+
fail('Release workflows must gate theme matrix smoke coverage on configured target URLs.');
7777
}
7878
if (!/Detect release artifact changes/.test(releaseOnMainWorkflow)) {
7979
fail('Release On Main workflow must detect whether a main push actually changed release artifacts.');

tests/versioning-guard.test.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ test('validation workflows delegate to the shared ci suite with dev coverage, fa
412412
assert.match(workflow, /uses:\s*\.\/\.github\/actions\/setup-ci-env/);
413413
assert.match(workflow, /Run release validation suite/);
414414
assert.match(workflow, /bash scripts\/run_ci_suite\.sh --release/);
415-
assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRED:\s*'1'/);
416-
assert.match(workflow, /FVPLUS_THEME_MATRIX_REQUIRED:\s*'1'/);
415+
assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_BROWSER_SMOKE_URL\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/);
416+
assert.match(workflow, /FVPLUS_THEME_MATRIX_REQUIRED:\s*\$\{\{\s*secrets\.FVPLUS_THEME_MATRIX_URLS\s*!=\s*''\s*&&\s*'1'\s*\|\|\s*'0'\s*\}\}/);
417417
assert.match(workflow, /FVPLUS_BROWSER_SMOKE_REQUIRE_FOLDER_EDITOR:\s*'1'/);
418418
assert.match(workflow, /FVPLUS_THEME_REQUIRED_LABELS:\s*'black,white'/);
419419
}

0 commit comments

Comments
 (0)