Skip to content

Commit 2d52460

Browse files
authored
fix: use aarch64-unknown-linux-musl instead of aarch64-unknown-linux-gnu (#1228)
Now that we have published a GitHub Release that contains arm64 musl artifacts for Linux, update the following scripts to take advantage of them: - `dotslash-config.json` now uses musl artifacts for the `linux-aarch64` target - `install_native_deps.sh` for the TypeScript CLI now includes `codex-linux-sandbox-aarch64-unknown-linux-musl` instead of `codex-linux-sandbox-aarch64-unknown-linux-gnu` for sandboxing - `codex-cli/bin/codex.js` now checks for `aarch64-unknown-linux-musl` artifacts instead of `aarch64-unknown-linux-gnu` ones
1 parent 77b017f commit 2d52460

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/dotslash-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"macos-aarch64": { "regex": "^codex-exec-aarch64-apple-darwin\\.zst$", "path": "codex-exec" },
66
"macos-x86_64": { "regex": "^codex-exec-x86_64-apple-darwin\\.zst$", "path": "codex-exec" },
77
"linux-x86_64": { "regex": "^codex-exec-x86_64-unknown-linux-musl\\.zst$", "path": "codex-exec" },
8-
"linux-aarch64": { "regex": "^codex-exec-aarch64-unknown-linux-gnu\\.zst$", "path": "codex-exec" }
8+
"linux-aarch64": { "regex": "^codex-exec-aarch64-unknown-linux-musl\\.zst$", "path": "codex-exec" }
99
}
1010
},
1111

@@ -14,14 +14,14 @@
1414
"macos-aarch64": { "regex": "^codex-aarch64-apple-darwin\\.zst$", "path": "codex" },
1515
"macos-x86_64": { "regex": "^codex-x86_64-apple-darwin\\.zst$", "path": "codex" },
1616
"linux-x86_64": { "regex": "^codex-x86_64-unknown-linux-musl\\.zst$", "path": "codex" },
17-
"linux-aarch64": { "regex": "^codex-aarch64-unknown-linux-gnu\\.zst$", "path": "codex" }
17+
"linux-aarch64": { "regex": "^codex-aarch64-unknown-linux-musl\\.zst$", "path": "codex" }
1818
}
1919
},
2020

2121
"codex-linux-sandbox": {
2222
"platforms": {
2323
"linux-x86_64": { "regex": "^codex-linux-sandbox-x86_64-unknown-linux-musl\\.zst$", "path": "codex-linux-sandbox" },
24-
"linux-aarch64": { "regex": "^codex-linux-sandbox-aarch64-unknown-linux-gnu\\.zst$", "path": "codex-linux-sandbox" }
24+
"linux-aarch64": { "regex": "^codex-linux-sandbox-aarch64-unknown-linux-musl\\.zst$", "path": "codex-linux-sandbox" }
2525
}
2626
}
2727
}

codex-cli/bin/codex.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if (wantsNative) {
4646
targetTriple = "x86_64-unknown-linux-musl";
4747
break;
4848
case "arm64":
49-
targetTriple = "aarch64-unknown-linux-gnu";
49+
targetTriple = "aarch64-unknown-linux-musl";
5050
break;
5151
default:
5252
break;

codex-cli/scripts/install_native_deps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mkdir -p "$BIN_DIR"
6565
# Until we start publishing stable GitHub releases, we have to grab the binaries
6666
# from the GitHub Action that created them. Update the URL below to point to the
6767
# appropriate workflow run:
68-
WORKFLOW_URL="https://github.com/openai/codex/actions/runs/15361005231"
68+
WORKFLOW_URL="https://github.com/openai/codex/actions/runs/15483216943"
6969
WORKFLOW_ID="${WORKFLOW_URL##*/}"
7070

7171
ARTIFACTS_DIR="$(mktemp -d)"
@@ -78,16 +78,16 @@ gh run download --dir "$ARTIFACTS_DIR" --repo openai/codex "$WORKFLOW_ID"
7878
zstd -d "$ARTIFACTS_DIR/x86_64-unknown-linux-musl/codex-linux-sandbox-x86_64-unknown-linux-musl.zst" \
7979
-o "$BIN_DIR/codex-linux-sandbox-x64"
8080

81-
zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-gnu/codex-linux-sandbox-aarch64-unknown-linux-gnu.zst" \
81+
zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-musl/codex-linux-sandbox-aarch64-unknown-linux-musl.zst" \
8282
-o "$BIN_DIR/codex-linux-sandbox-arm64"
8383

8484
if [[ "$INCLUDE_RUST" -eq 1 ]]; then
8585
# x64 Linux
8686
zstd -d "$ARTIFACTS_DIR/x86_64-unknown-linux-musl/codex-x86_64-unknown-linux-musl.zst" \
8787
-o "$BIN_DIR/codex-x86_64-unknown-linux-musl"
8888
# ARM64 Linux
89-
zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-gnu/codex-aarch64-unknown-linux-gnu.zst" \
90-
-o "$BIN_DIR/codex-aarch64-unknown-linux-gnu"
89+
zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-musl/codex-aarch64-unknown-linux-musl.zst" \
90+
-o "$BIN_DIR/codex-aarch64-unknown-linux-musl"
9191
# x64 macOS
9292
zstd -d "$ARTIFACTS_DIR/x86_64-apple-darwin/codex-x86_64-apple-darwin.zst" \
9393
-o "$BIN_DIR/codex-x86_64-apple-darwin"

codex-cli/scripts/stage_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# When --native is supplied we copy the linux-sandbox binaries (as before) and
1818
# additionally fetch / unpack the two Rust targets that we currently support:
1919
# - x86_64-unknown-linux-musl
20-
# - aarch64-unknown-linux-gnu
20+
# - aarch64-unknown-linux-musl
2121
#
2222
# NOTE: This script is intended to be run from the repository root via
2323
# `pnpm --filter codex-cli stage-release ...` or inside codex-cli with the

0 commit comments

Comments
 (0)