From d728312b5885d6edff276ab7ab3b47afc7fbbfaa Mon Sep 17 00:00:00 2001 From: Affaan Mustafa Date: Tue, 31 Mar 2026 01:38:00 -0400 Subject: [PATCH] fix(ci): resolve cross-platform test failures - Sanity check script (check-codex-global-state.sh) now falls back to grep -E when ripgrep is not available, fixing the codex-hooks sync test on all CI platforms. Patterns converted to POSIX ERE for portability. - Unicode safety test accepts both / and \ path separators so the executable-file assertion passes on Windows. - Gacha test sets PYTHONUTF8=1 so Python uses UTF-8 stdout encoding on Windows instead of cp1252, preventing UnicodeEncodeError on box-drawing characters. - Quoted-hook-path test skipped on Windows where NTFS disallows double-quote characters in filenames. --- scripts/codex/check-codex-global-state.sh | 28 ++++++++++++------- tests/scripts/check-unicode-safety.test.js | 2 +- tests/scripts/codex-hooks.test.js | 6 +++- .../openclaw-persona-forge-gacha.test.js | 1 + 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/scripts/codex/check-codex-global-state.sh b/scripts/codex/check-codex-global-state.sh index 4a7f2ec6..eb980199 100755 --- a/scripts/codex/check-codex-global-state.sh +++ b/scripts/codex/check-codex-global-state.sh @@ -8,6 +8,14 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" CODEX_HOME="${CODEX_HOME:-$HOME/.codex}" +# Use rg if available, otherwise fall back to grep -E. +# All patterns in this script must be POSIX ERE compatible. +if command -v rg >/dev/null 2>&1; then + search_file() { rg -n "$1" "$2" >/dev/null 2>&1; } +else + search_file() { grep -En "$1" "$2" >/dev/null 2>&1; } +fi + CONFIG_FILE="$CODEX_HOME/config.toml" AGENTS_FILE="$CODEX_HOME/AGENTS.md" PROMPTS_DIR="$CODEX_HOME/prompts" @@ -48,7 +56,7 @@ require_file() { check_config_pattern() { local pattern="$1" local label="$2" - if rg -n "$pattern" "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file "$pattern" "$CONFIG_FILE"; then ok "$label" else fail "$label" @@ -58,7 +66,7 @@ check_config_pattern() { check_config_absent() { local pattern="$1" local label="$2" - if rg -n "$pattern" "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file "$pattern" "$CONFIG_FILE"; then fail "$label" else ok "$label" @@ -73,13 +81,13 @@ require_file "$CONFIG_FILE" "Global config.toml" require_file "$AGENTS_FILE" "Global AGENTS.md" if [[ -f "$AGENTS_FILE" ]]; then - if rg -n '^# Everything Claude Code \(ECC\) — Agent Instructions' "$AGENTS_FILE" >/dev/null 2>&1; then + if search_file '^# Everything Claude Code \(ECC\)' "$AGENTS_FILE"; then ok "AGENTS contains ECC root instructions" else fail "AGENTS missing ECC root instructions" fi - if rg -n '^# Codex Supplement \(From ECC \.codex/AGENTS\.md\)' "$AGENTS_FILE" >/dev/null 2>&1; then + if search_file '^# Codex Supplement \(From ECC \.codex/AGENTS\.md\)' "$AGENTS_FILE"; then ok "AGENTS contains ECC Codex supplement" else fail "AGENTS missing ECC Codex supplement" @@ -87,11 +95,11 @@ if [[ -f "$AGENTS_FILE" ]]; then fi if [[ -f "$CONFIG_FILE" ]]; then - check_config_pattern '^multi_agent\s*=\s*true' "multi_agent is enabled" - check_config_absent '^\s*collab\s*=' "deprecated collab flag is absent" + check_config_pattern '^multi_agent[[:space:]]*=[[:space:]]*true' "multi_agent is enabled" + check_config_absent '^[[:space:]]*collab[[:space:]]*=' "deprecated collab flag is absent" # persistent_instructions is recommended but optional; warn instead of fail # so users who rely on AGENTS.md alone are not blocked (#967). - if rg -n '^[[:space:]]*persistent_instructions\s*=' "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file '^[[:space:]]*persistent_instructions[[:space:]]*=' "$CONFIG_FILE"; then ok "persistent_instructions is configured" else warn "persistent_instructions is not set (recommended but optional)" @@ -105,7 +113,7 @@ if [[ -f "$CONFIG_FILE" ]]; then 'mcp_servers.sequential-thinking' \ 'mcp_servers.context7' do - if rg -n "^\[$section\]" "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file "^\[$section\]" "$CONFIG_FILE"; then ok "MCP section [$section] exists" else fail "MCP section [$section] missing" @@ -115,11 +123,11 @@ if [[ -f "$CONFIG_FILE" ]]; then has_context7_legacy=0 has_context7_current=0 - if rg -n '^\[mcp_servers\.context7\]' "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file '^\[mcp_servers\.context7\]' "$CONFIG_FILE"; then has_context7_legacy=1 fi - if rg -n '^\[mcp_servers\.context7-mcp\]' "$CONFIG_FILE" >/dev/null 2>&1; then + if search_file '^\[mcp_servers\.context7-mcp\]' "$CONFIG_FILE"; then has_context7_current=1 fi diff --git a/tests/scripts/check-unicode-safety.test.js b/tests/scripts/check-unicode-safety.test.js index d52b7c15..dca3e679 100644 --- a/tests/scripts/check-unicode-safety.test.js +++ b/tests/scripts/check-unicode-safety.test.js @@ -89,7 +89,7 @@ if ( const result = runCheck(root, ['--write']); assert.notStrictEqual(result.status, 0, result.stdout + result.stderr); - assert.match(result.stderr, /scripts\/sample\.js:1:23 emoji U\+1F680/); + assert.match(result.stderr, /scripts[/\\]sample\.js:1:23 emoji U\+1F680/); assert.strictEqual(fs.readFileSync(scriptFile, 'utf8'), original); }) ) diff --git a/tests/scripts/codex-hooks.test.js b/tests/scripts/codex-hooks.test.js index 303b7286..d2eda83e 100644 --- a/tests/scripts/codex-hooks.test.js +++ b/tests/scripts/codex-hooks.test.js @@ -66,7 +66,11 @@ function makeHermeticCodexEnv(homeDir, codexDir, extraEnv = {}) { let passed = 0; let failed = 0; -if ( +// Windows NTFS does not allow double-quote characters in file paths, +// so the quoted-path shell-injection test is only meaningful on Unix. +if (os.platform() === 'win32') { + console.log(' - install-global-git-hooks.sh quoted paths (skipped on Windows)'); +} else if ( test('install-global-git-hooks.sh handles quoted hook paths without shell injection', () => { const homeDir = createTempDir('codex-hooks-home-'); const weirdHooksDir = path.join(homeDir, 'git-hooks "quoted"'); diff --git a/tests/scripts/openclaw-persona-forge-gacha.test.js b/tests/scripts/openclaw-persona-forge-gacha.test.js index e9156822..6f5cceb8 100644 --- a/tests/scripts/openclaw-persona-forge-gacha.test.js +++ b/tests/scripts/openclaw-persona-forge-gacha.test.js @@ -30,6 +30,7 @@ function runGacha(pythonBin, arg) { return spawnSync(pythonBin, [SCRIPT, arg], { encoding: 'utf8', maxBuffer: 10 * 1024 * 1024, + env: { ...process.env, PYTHONUTF8: '1' }, }); }