Skip to content

Commit 59613cc

Browse files
authored
Merge branch 'main' into add-github-action-for-nix
2 parents a25cadf + 8d56d2f commit 59613cc

File tree

175 files changed

+11113
-4137
lines changed

Some content is hidden

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

175 files changed

+11113
-4137
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,18 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v5
1616

17-
- name: Setup Node.js
18-
uses: actions/setup-node@v4
19-
with:
20-
node-version: 22
21-
2217
- name: Setup pnpm
2318
uses: pnpm/action-setup@v4
2419
with:
25-
version: 10.8.1
2620
run_install: false
2721

28-
- name: Get pnpm store directory
29-
id: pnpm-cache
30-
shell: bash
31-
run: |
32-
echo "store_path=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
33-
34-
- name: Setup pnpm cache
35-
uses: actions/cache@v4
22+
- name: Setup Node.js
23+
uses: actions/setup-node@v5
3624
with:
37-
path: ${{ steps.pnpm-cache.outputs.store_path }}
38-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
39-
restore-keys: |
40-
${{ runner.os }}-pnpm-store-
25+
node-version: 22
4126

4227
- name: Install dependencies
43-
run: pnpm install
28+
run: pnpm install --frozen-lockfile
4429

4530
# Run all tasks using workspace filters
4631

.github/workflows/rust-ci.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,26 @@ jobs:
6262
components: rustfmt
6363
- name: cargo fmt
6464
run: cargo fmt -- --config imports_granularity=Item --check
65+
- name: Verify codegen for mcp-types
66+
run: ./mcp-types/check_lib_rs.py
67+
68+
cargo_shear:
69+
name: cargo shear
70+
runs-on: ubuntu-24.04
71+
needs: changed
72+
if: ${{ needs.changed.outputs.codex == 'true' || needs.changed.outputs.workflows == 'true' || github.event_name == 'push' }}
73+
defaults:
74+
run:
75+
working-directory: codex-rs
76+
steps:
77+
- uses: actions/checkout@v5
78+
- uses: dtolnay/[email protected]
79+
- uses: taiki-e/install-action@0c5db7f7f897c03b771660e91d065338615679f4 # v2
80+
with:
81+
tool: cargo-shear
82+
version: 1.5.1
83+
- name: cargo shear
84+
run: cargo shear
6585

6686
# --- CI to validate on different os/targets --------------------------------
6787
lint_build_test:
@@ -160,12 +180,17 @@ jobs:
160180
find . -name Cargo.toml -mindepth 2 -maxdepth 2 -print0 \
161181
| xargs -0 -n1 -I{} bash -c 'cd "$(dirname "{}")" && cargo check --profile ${{ matrix.profile }}'
162182
163-
- name: cargo test
183+
- uses: taiki-e/install-action@0c5db7f7f897c03b771660e91d065338615679f4 # v2
184+
with:
185+
tool: nextest
186+
version: 0.9.103
187+
188+
- name: tests
164189
id: test
165-
# `cargo test` takes too long for release builds to run them on every PR
190+
# Tests take too long for release builds to run them on every PR.
166191
if: ${{ matrix.profile != 'release' }}
167192
continue-on-error: true
168-
run: cargo test --all-features --target ${{ matrix.target }} --profile ${{ matrix.profile }}
193+
run: cargo nextest run --all-features --no-fail-fast --target ${{ matrix.target }}
169194
env:
170195
RUST_BACKTRACE: 1
171196

@@ -182,14 +207,15 @@ jobs:
182207
# --- Gatherer job that you mark as the ONLY required status -----------------
183208
results:
184209
name: CI results (required)
185-
needs: [changed, general, lint_build_test]
210+
needs: [changed, general, cargo_shear, lint_build_test]
186211
if: always()
187212
runs-on: ubuntu-24.04
188213
steps:
189214
- name: Summarize
190215
shell: bash
191216
run: |
192217
echo "general: ${{ needs.general.result }}"
218+
echo "shear : ${{ needs.cargo_shear.result }}"
193219
echo "matrix : ${{ needs.lint_build_test.result }}"
194220
195221
# If nothing relevant changed (PR touching only root README, etc.),
@@ -201,4 +227,5 @@ jobs:
201227
202228
# Otherwise require the jobs to have succeeded
203229
[[ '${{ needs.general.result }}' == 'success' ]] || { echo 'general failed'; exit 1; }
230+
[[ '${{ needs.cargo_shear.result }}' == 'success' ]] || { echo 'cargo_shear failed'; exit 1; }
204231
[[ '${{ needs.lint_build_test.result }}' == 'success' ]] || { echo 'matrix failed'; exit 1; }

.github/workflows/rust-release.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,22 @@ jobs:
219219
with:
220220
tag: ${{ github.ref_name }}
221221
config: .github/dotslash-config.json
222+
223+
update-branch:
224+
name: Update latest-alpha-cli branch
225+
permissions:
226+
contents: write
227+
needs: release
228+
runs-on: ubuntu-latest
229+
230+
steps:
231+
- name: Update latest-alpha-cli branch
232+
env:
233+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
234+
run: |
235+
set -euo pipefail
236+
gh api \
237+
repos/${GITHUB_REPOSITORY}/git/refs/heads/latest-alpha-cli \
238+
-X PATCH \
239+
-f sha="${GITHUB_SHA}" \
240+
-F force=true

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
<p align="center"><code>npm i -g @openai/codex</code><br />or <code>brew install codex</code></p>
44

5-
<p align="center"><strong>Codex CLI</strong> is a coding agent from OpenAI that runs locally on your computer.</br>If you are looking for the <em>cloud-based agent</em> from OpenAI, <strong>Codex Web</strong>, see <a href="https://chatgpt.com/codex">chatgpt.com/codex</a>.</p>
5+
<p align="center"><strong>Codex CLI</strong> is a coding agent from OpenAI that runs locally on your computer.
6+
</br>
7+
</br>If you want Codex in your code editor (VS Code, Cursor, Windsurf), <a href="https://developers.openai.com/codex/ide">install in your IDE</a>
8+
</br>If you are looking for the <em>cloud-based agent</em> from OpenAI, <strong>Codex Web</strong>, go to <a href="https://chatgpt.com/codex">chatgpt.com/codex</a></p>
69

710
<p align="center">
811
<img src="./.github/codex-cli-splash.png" alt="Codex CLI splash" width="80%" />
@@ -75,7 +78,7 @@ Codex CLI supports a rich set of configuration options, with preferences stored
7578
- [CLI usage](./docs/getting-started.md#cli-usage)
7679
- [Running with a prompt as input](./docs/getting-started.md#running-with-a-prompt-as-input)
7780
- [Example prompts](./docs/getting-started.md#example-prompts)
78-
- [Memory with AGENTS.md](./docs/getting-started.md#memory--project-docs)
81+
- [Memory with AGENTS.md](./docs/getting-started.md#memory-with-agentsmd)
7982
- [Configuration](./docs/config.md)
8083
- [**Sandbox & approvals**](./docs/sandbox.md)
8184
- [**Authentication**](./docs/authentication.md)

0 commit comments

Comments
 (0)