Skip to content

Commit 27e67a6

Browse files
CSResselaibrahim-oaiiceweasel-oaidylan-hurd-oaijif-oai
authored
Sync upstream rust-v0.64.0 (#66)
## Upstream Sync This PR syncs changes from upstream release `rust-v0.64.0`. ### Summary - **Upstream tag:** `rust-v0.64.0` - **Commits to merge:** ~183 - **Release notes:** [GitHub Release](https://github.com/openai/codex/releases/tag/rust-v0.64.0) ### Workflow Sanitization The following upstream workflows had their triggers replaced with \`workflow_dispatch\`: - `cargo-deny.yml` - `ci.yml` - `cla.yml` - `close-stale-contributor-prs.yml` - `codespell.yml` - `issue-deduplicator.yml` - `issue-labeler.yml` - `rust-release.yml` - `sdk.yml` - `shell-tool-mcp-ci.yml` - `shell-tool-mcp.yml` ### Merge Instructions 1. Review the changes for conflicts with our ACP fork work 2. Resolve any merge conflicts: ```bash git checkout dev git merge sync/upstream-v0.64.0 --no-ff # Resolve conflicts if any ``` 3. Run tests: `cd codex-rs && cargo test` 4. Update snapshot tests if needed: `cargo insta review` 5. Mark as ready for review when satisfied ### After Merge - Delete the `sync/upstream-v0.64.0` branch - Consider tagging a new nori release if significant changes --------- Signed-off-by: Fahad <fahad@2doapp.com> Signed-off-by: lionelchg <lionel.cheng@hotmail.fr> Signed-off-by: kyuheon-kr <kyuheon.kr@gmail.com> Signed-off-by: lionel-oai <lionel@openai.com> Signed-off-by: Dmitri Khokhlov <dkhokhlov@cribl.io> Signed-off-by: Yorling <shallowcloud@yeah.net> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Ahmed Ibrahim <aibrahim@openai.com> Co-authored-by: iceweasel-oai <iceweasel@openai.com> Co-authored-by: Dylan Hurd <dylan.hurd@openai.com> Co-authored-by: jif-oai <jif@openai.com> Co-authored-by: Anton Panasenko <apanasenko@openai.com> Co-authored-by: simister <simcoea@gmail.com> Co-authored-by: Eric Traut <etraut@openai.com> Co-authored-by: Owen Lin <owenlin0@gmail.com> Co-authored-by: Jeremy Rose <172423086+nornagon-openai@users.noreply.github.com> Co-authored-by: zhao-oai <zhao@openai.com> Co-authored-by: Celia Chen <celia@openai.com> Co-authored-by: pakrym-oai <pakrym@openai.com> Co-authored-by: ae <ae@openai.com> Co-authored-by: Michael Bolin <mbolin@openai.com> Co-authored-by: Thibault Sottiaux <tibo@openai.com> Co-authored-by: Beehive Innovations <guidedways@users.noreply.github.com> Co-authored-by: Lionel Cheng <60159831+lionelchg@users.noreply.github.com> Co-authored-by: hanson-openai <hanson@openai.com> Co-authored-by: LIHUA <1017343802@qq.com> Co-authored-by: Josh McKinney <joshka@openai.com> Co-authored-by: Kyuheon Kim <65669461+kyuheon-kr@users.noreply.github.com> Co-authored-by: lionel-oai <lionel@openai.com> Co-authored-by: Dmitri Khokhlov <dkhokhlov@gmail.com> Co-authored-by: Weiller Carvalho <99501431+weillercarvalho@users.noreply.github.com> Co-authored-by: Xiao-Yong Jin <jinxiaoyong@gmail.com> Co-authored-by: Yorling <shallowcloud@yeah.net> Co-authored-by: Matthew Zeng <mzeng@openai.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Klausner <wiz@gatalith.at> Co-authored-by: Gabriel Peal <gpeal@users.noreply.github.com> Co-authored-by: Priyadarshini Tamilselvan <priya61197@gmail.com> Co-authored-by: lionelchg <lionel.cheng@hotmail.fr> Co-authored-by: Job Chong <jobchong@users.noreply.github.com> Co-authored-by: Ali Towaiji <145403626+Towaiji@users.noreply.github.com> Co-authored-by: Albert O'Shea <albertoshea2@gmail.com> Co-authored-by: Kaden Gruizenga <kjgruiz@pm.me> Co-authored-by: linuxmetel <61399424+linuxmetel@users.noreply.github.com> Co-authored-by: Steve Mostovoy <stevemostovoy@openai.com> Co-authored-by: Manoel Calixto <manoel.calixto.neto@gmail.com> Co-authored-by: Colin Young <ccy@openai.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 10bcc9e commit 27e67a6

406 files changed

Lines changed: 26161 additions & 7884 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cargo-deny.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: cargo-deny
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
cargo-deny:
7+
runs-on: ubuntu-latest
8+
defaults:
9+
run:
10+
working-directory: ./codex-rs
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v6
14+
15+
- name: Install Rust toolchain
16+
uses: dtolnay/rust-toolchain@stable
17+
18+
- name: Run cargo-deny
19+
uses: EmbarkStudios/cargo-deny-action@v1
20+
with:
21+
rust-version: stable
22+
manifest-path: ./codex-rs/Cargo.toml

.github/workflows/rust-ci.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,33 @@ jobs:
3535
targets: ${{ matrix.target }}
3636
components: clippy
3737

38-
- name: Install nightly rustfmt
39-
run: rustup toolchain install nightly --component rustfmt --profile minimal
38+
- name: Compute lockfile hash
39+
id: lockhash
40+
working-directory: codex-rs
41+
shell: bash
42+
run: |
43+
set -euo pipefail
44+
echo "hash=$(sha256sum Cargo.lock | cut -d' ' -f1)" >> "$GITHUB_OUTPUT"
45+
echo "toolchain_hash=$(sha256sum rust-toolchain.toml | cut -d' ' -f1)" >> "$GITHUB_OUTPUT"
46+
47+
# Explicit cache restore: split cargo home vs target, so we can
48+
# avoid caching the large target dir on the gnu-dev job.
49+
- name: Restore cargo home cache
50+
id: cache_cargo_home_restore
51+
uses: actions/cache/restore@v4
52+
with:
53+
path: |
54+
~/.cargo/bin/
55+
~/.cargo/registry/index/
56+
~/.cargo/registry/cache/
57+
~/.cargo/git/db/
58+
key: cargo-home-${{ matrix.runner }}-${{ matrix.target }}-${{ matrix.profile }}-${{ steps.lockhash.outputs.hash }}-${{ steps.lockhash.outputs.toolchain_hash }}
59+
restore-keys: |
60+
cargo-home-${{ matrix.runner }}-${{ matrix.target }}-${{ matrix.profile }}-
4061
41-
# sccache setup
62+
# Install and restore sccache cache
4263
- name: Install sccache
64+
if: ${{ env.USE_SCCACHE == 'true' }}
4365
uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2
4466
with:
4567
tool: sccache
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: shell-tool-mcp CI
2+
3+
on: workflow_dispatch
4+
5+
env:
6+
NODE_VERSION: 22
7+
8+
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v6
14+
15+
- name: Setup pnpm
16+
uses: pnpm/action-setup@v4
17+
with:
18+
run_install: false
19+
20+
- name: Setup Node.js
21+
uses: actions/setup-node@v5
22+
with:
23+
node-version: ${{ env.NODE_VERSION }}
24+
cache: "pnpm"
25+
26+
- name: Install dependencies
27+
run: pnpm install --frozen-lockfile
28+
29+
- name: Format check
30+
run: pnpm --filter @openai/codex-shell-tool-mcp run format
31+
32+
- name: Run tests
33+
run: pnpm --filter @openai/codex-shell-tool-mcp test
34+
35+
- name: Build
36+
run: pnpm --filter @openai/codex-shell-tool-mcp run build

0 commit comments

Comments
 (0)