Skip to content

refactor: deduplicate hardcoded version strings #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wasim-builds wants to merge 8 commits into from
Closed

refactor: deduplicate hardcoded version strings #50

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61f8af0
refactor: use VERSION file as single source of truth
Jul 16, 2026
56cc20e
Resolve merge conflicts
Jul 18, 2026
829896b
ci: remove obsolete version consistency check
wasim-builds Jul 19, 2026
4423fe9
Merge main and resolve conflicts
wasim-builds Jul 19, 2026
ed14bd1
fix: restore missing newline in common-macos.sh
wasim-builds Jul 19, 2026
e6463fd
fix: revert test-breaking CODEX_EXPECTED_TEAM_ID fallback
wasim-builds Jul 19, 2026
c4b5397
fix: restore missing newline in run-tests.sh
wasim-builds Jul 19, 2026
2fb05ea
fix: use $1 instead of unbound $ROOT in subshell
wasim-builds Jul 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion macos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "codex-dream-skin-studio",
"version": "1.1.2",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion macos/scripts/build-client-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ trap '/bin/rm -rf "$TMP"' EXIT
> "$CLIENT_ROOT/安装 Codex 主题编辑器.command"

/usr/bin/printf '%s\n' \
'Codex 主题编辑器 1.1.2' \
'Codex 主题编辑器 '"$(/bin/cat "$ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\\n\\r')" \\
'' \
'推荐方式：把这个完整 ZIP、你喜欢的图片和“给 Codex 的部署提示词.md”一起发给自己的 Codex。' \
'' \
Expand Down
2 changes: 1 addition & 1 deletion macos/scripts/common-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ START_ERROR_LOG="$STATE_ROOT/start-error.log"
CODEX_APP_JOB_LABEL="com.openai.codex-dream-skin-studio.app"
INJECTOR_JOB_LABEL="com.openai.codex-dream-skin-studio.injector"
EXPECTED_CODEX_TEAM_ID="${CODEX_EXPECTED_TEAM_ID:-2DC432GLL2}"
SKIN_VERSION="1.1.2"
SKIN_VERSION="$(/bin/cat "$PROJECT_ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\\n\\r')"

fail() {
local message="$*"
Expand Down
2 changes: 1 addition & 1 deletion macos/scripts/injector.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";

const here = path.dirname(fileURLToPath(import.meta.url));
const root = path.resolve(here, "..");
const SKIN_VERSION = "1.1.2";
const SKIN_VERSION = (await fs.readFile(path.join(root, "VERSION"), "utf-8")).trim();
const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "[::1]"]);
const MAX_ART_BYTES = 16 * 1024 * 1024;

Expand Down
4 changes: 2 additions & 2 deletions macos/tests/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUNTIME_STATE="$RUNTIME_STATE_ROOT/state.json"
STATE_EVAL_MARKER="$TMP/state-eval-marker"
EXPECTED_BUNDLE="/Applications/Codex \$(touch \"$STATE_EVAL_MARKER\").app"
EXPECTED_EXE="$EXPECTED_BUNDLE/Contents/MacOS/ChatGPT; touch \"$STATE_EVAL_MARKER\""
EXPECTED_VERSION='1.1.2 "nightly"'
EXPECTED_VERSION="$(/bin/cat "$ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\\n\\r') \\"nightly\\""
EXPECTED_TEAM_ID="TEAM'ID"
/bin/mkdir -p "$RUNTIME_STATE_ROOT"
"$NODE" -e '
Expand Down Expand Up @@ -110,7 +110,7 @@ NO_DESKTOP_BACKUP="$TMP/theme-backup-without-desktop.json"
"$NODE" "$ROOT/scripts/theme-config.mjs" restore "$NO_DESKTOP_CONFIG" "$NO_DESKTOP_BACKUP" >/dev/null
/usr/bin/cmp -s "$NO_DESKTOP_CONFIG" "$TMP/original-without-desktop.toml"

/usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "1.1.2" ]' _ "$ROOT"
/usr/bin/env -u HOME /bin/bash -c '. "$1/scripts/common-macos.sh"; [ -n "$HOME" ] && [ "$SKIN_VERSION" = "$(/bin/cat "$ROOT/VERSION" 2>/dev/null | /usr/bin/tr -d '\''\n\r'\'')" ]' _ "$ROOT"
"$ROOT/scripts/doctor-macos.sh" >/dev/null

printf 'PASS: syntax, payload, runtime-state safety, custom-theme, config round-trips, HOME recovery, signature, and doctor checks.\n'