Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion updater/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "codex-update-manager"
version = "0.10.0"
version = "0.10.1"
edition = "2021"

[dependencies]
Expand Down
29 changes: 27 additions & 2 deletions updater/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ use tracing::info;

const UPDATE_BUILDER_MANIFEST: &str = ".codex-linux/update-builder-manifest.txt";

const REQUIRED_BUNDLE_FILES: [(&str, &str); 20] = [
const REQUIRED_BUNDLE_FILES: [(&str, &str); 22] = [
("Cargo.toml", "Cargo.toml"),
("Cargo.lock", "Cargo.lock"),
("computer-use-linux", "computer-use-linux"),
("notification-actions-linux", "notification-actions-linux"),
("read-aloud-linux", "read-aloud-linux"),
("record-replay-linux", "record-replay-linux"),
("updater", "updater"),
Expand All @@ -32,6 +33,7 @@ const REQUIRED_BUNDLE_FILES: [(&str, &str); 20] = [
"plugins/openai-bundled/plugins/read-aloud",
),
("install.sh", "install.sh"),
("launcher/cli-launch-path.py", "launcher/cli-launch-path.py"),
("launcher/start.sh.template", "launcher/start.sh.template"),
("launcher/webview-server.py", "launcher/webview-server.py"),
("scripts/build-deb.sh", "scripts/build-deb.sh"),
Expand Down Expand Up @@ -616,7 +618,7 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
fn write_fake_computer_use_bundle(root: &Path) -> Result<()> {
fs::write(
root.join("Cargo.toml"),
b"[workspace]\nmembers = [\"computer-use-linux\", \"read-aloud-linux\", \"record-replay-linux\", \"updater\"]\n",
b"[workspace]\nmembers = [\"computer-use-linux\", \"notification-actions-linux\", \"read-aloud-linux\", \"record-replay-linux\", \"updater\"]\n",
)?;
fs::write(root.join("Cargo.lock"), b"# fake lock\n")?;
fs::create_dir_all(root.join("computer-use-linux/src"))?;
Expand All @@ -628,6 +630,15 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
root.join("computer-use-linux/src/main.rs"),
b"fn main() {}\n",
)?;
fs::create_dir_all(root.join("notification-actions-linux/src"))?;
fs::write(
root.join("notification-actions-linux/Cargo.toml"),
b"[package]\nname = \"codex-notification-actions-linux\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
)?;
fs::write(
root.join("notification-actions-linux/src/main.rs"),
b"fn main() {}\n",
)?;
fs::create_dir_all(root.join("read-aloud-linux/src"))?;
fs::write(
root.join("read-aloud-linux/Cargo.toml"),
Expand Down Expand Up @@ -735,6 +746,10 @@ touch "${DIST_DIR_OVERRIDE}/codex-desktop-${VER}-1-x86_64.pkg.tar.zst"
bundle_root.join(".codex-linux/source-info.json"),
b"{\"commit\":\"0123456789012345678901234567890123456789\",\"version\":\"0.8.1\"}\n",
)?;
fs::write(
bundle_root.join("launcher/cli-launch-path.py"),
b"# fake CLI launch path helper\n",
)?;
fs::write(
bundle_root.join("launcher/start.sh.template"),
b"# fake launcher template\n",
Expand Down Expand Up @@ -949,6 +964,10 @@ fi
write_fake_linux_features_bundle(&source_root)?;
write_fake_patch_bundle(&source_root)?;
fs::write(source_root.join("install.sh"), b"#!/bin/bash\n")?;
fs::write(
source_root.join("launcher/cli-launch-path.py"),
b"# fake CLI launch path helper\n",
)?;
fs::write(
source_root.join("launcher/start.sh.template"),
b"# fake launcher template\n",
Expand Down Expand Up @@ -994,10 +1013,16 @@ fi
assert!(destination_root.join("launcher/webview-server.py").exists());
assert_fresh_patch_bundle(&destination_root);
assert!(destination_root.join("computer-use-linux").exists());
assert!(destination_root
.join("notification-actions-linux/Cargo.toml")
.exists());
assert!(!destination_root.join("global-dictation-linux").exists());
assert!(destination_root.join("read-aloud-linux").exists());
assert!(destination_root.join("record-replay-linux").exists());
assert!(destination_root.join("updater").exists());
assert!(destination_root
.join("launcher/cli-launch-path.py")
.exists());
assert!(destination_root.join("assets/codex-linux.png").exists());
assert!(destination_root
.join("plugins/openai-bundled/plugins/computer-use/.mcp.json")
Expand Down
Loading