mirror of
https://github.com/openai/codex.git
synced 2026-05-23 12:34:25 +00:00
80c4a978f8
## Why Release packaging should be a staging step once release binaries have already been built and signed. The Windows release job was downloading and signing `codex-command-runner.exe` and `codex-windows-sandbox-setup.exe`, but `scripts/build_codex_package.py` still rebuilt those helpers while creating the package archives. That makes the package step slower and, more importantly, risks putting helper binaries in the archive that were produced after the signing step. Linux had the same shape for package resources: `bwrap` could be rebuilt by the package builder instead of being passed in as a prebuilt release artifact. This builds on #23752, which fixes `.tar.zst` creation when Windows runners rely on the repository DotSlash `zstd` wrapper. ## What changed - Add explicit prebuilt resource inputs to the Codex package builder: - `--bwrap-bin` - `--codex-command-runner-bin` - `--codex-windows-sandbox-setup-bin` - Make `.github/scripts/build-codex-package-archive.sh` pass resource binaries from the release output directory when they are already present. - Build Linux `bwrap` for app-server release jobs too, so app-server package creation does not invoke Cargo just to supply the package resource. - Keep macOS package creation as a no-Cargo path when `--entrypoint-bin` is provided, since macOS packages have no resource binaries. - Add unit coverage showing prebuilt macOS, Linux, and Windows package inputs result in no source-built binaries. ## Verification - `python3 -m unittest discover -s scripts/codex_package -p 'test_*.py'` - `python3 -m py_compile scripts/codex_package/*.py` - `bash -n .github/scripts/build-codex-package-archive.sh` - Dry-ran Linux and Windows package builds with fake prebuilt resources and a nonexistent Cargo path to verify the package builder did not invoke Cargo. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/23759). * #23760 * __->__ #23759
99 lines
3.5 KiB
Python
99 lines
3.5 KiB
Python
#!/usr/bin/env python3
|
|
|
|
from pathlib import Path
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
|
|
|
from codex_package.cargo import build_source_binaries
|
|
from codex_package.cargo import source_binaries_for_target
|
|
from codex_package.targets import PACKAGE_VARIANTS
|
|
from codex_package.targets import TARGET_SPECS
|
|
|
|
|
|
class SourceBinariesForTargetTest(unittest.TestCase):
|
|
def test_macos_package_with_prebuilt_entrypoint_builds_nothing(self) -> None:
|
|
self.assertEqual(
|
|
source_binaries_for_target(
|
|
TARGET_SPECS["aarch64-apple-darwin"],
|
|
PACKAGE_VARIANTS["codex"],
|
|
build_entrypoint=False,
|
|
build_bwrap=False,
|
|
build_codex_command_runner=False,
|
|
build_codex_windows_sandbox_setup=False,
|
|
),
|
|
[],
|
|
)
|
|
|
|
def test_linux_package_with_prebuilt_entrypoint_and_bwrap_builds_nothing(self) -> None:
|
|
self.assertEqual(
|
|
source_binaries_for_target(
|
|
TARGET_SPECS["x86_64-unknown-linux-musl"],
|
|
PACKAGE_VARIANTS["codex"],
|
|
build_entrypoint=False,
|
|
build_bwrap=False,
|
|
build_codex_command_runner=False,
|
|
build_codex_windows_sandbox_setup=False,
|
|
),
|
|
[],
|
|
)
|
|
|
|
def test_windows_package_with_prebuilt_entrypoint_and_helpers_builds_nothing(self) -> None:
|
|
self.assertEqual(
|
|
source_binaries_for_target(
|
|
TARGET_SPECS["x86_64-pc-windows-msvc"],
|
|
PACKAGE_VARIANTS["codex"],
|
|
build_entrypoint=False,
|
|
build_bwrap=False,
|
|
build_codex_command_runner=False,
|
|
build_codex_windows_sandbox_setup=False,
|
|
),
|
|
[],
|
|
)
|
|
|
|
def test_missing_windows_helpers_are_built(self) -> None:
|
|
self.assertEqual(
|
|
source_binaries_for_target(
|
|
TARGET_SPECS["x86_64-pc-windows-msvc"],
|
|
PACKAGE_VARIANTS["codex"],
|
|
build_entrypoint=False,
|
|
build_bwrap=False,
|
|
build_codex_command_runner=True,
|
|
build_codex_windows_sandbox_setup=True,
|
|
),
|
|
["codex-command-runner", "codex-windows-sandbox-setup"],
|
|
)
|
|
|
|
def test_build_uses_prebuilt_windows_helpers_without_running_cargo(self) -> None:
|
|
with tempfile.TemporaryDirectory() as temp_dir:
|
|
root = Path(temp_dir)
|
|
entrypoint = touch_file(root / "codex.exe")
|
|
command_runner = touch_file(root / "codex-command-runner.exe")
|
|
sandbox_setup = touch_file(root / "codex-windows-sandbox-setup.exe")
|
|
|
|
outputs = build_source_binaries(
|
|
TARGET_SPECS["x86_64-pc-windows-msvc"],
|
|
PACKAGE_VARIANTS["codex"],
|
|
cargo=str(root / "cargo-that-should-not-run"),
|
|
profile="release",
|
|
entrypoint_bin=entrypoint,
|
|
bwrap_bin=None,
|
|
codex_command_runner_bin=command_runner,
|
|
codex_windows_sandbox_setup_bin=sandbox_setup,
|
|
)
|
|
|
|
self.assertEqual(outputs.entrypoint_bin, entrypoint)
|
|
self.assertEqual(outputs.codex_command_runner_bin, command_runner)
|
|
self.assertEqual(outputs.codex_windows_sandbox_setup_bin, sandbox_setup)
|
|
|
|
|
|
def touch_file(path: Path) -> Path:
|
|
path.write_text("", encoding="utf-8")
|
|
return path.resolve()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|