Skip to content

Commit 990677a

Browse files
committed
merge: sync upstream/main into fork while preserving local debug flows
2 parents 46ab643 + 9a859b5 commit 990677a

116 files changed

Lines changed: 28062 additions & 1396 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.

.env.example

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,10 @@
2424

2525
# 第三方绑卡 API Key(可留空,后端会先尝试无鉴权)
2626
# BIND_CARD_API_KEY=your_api_key_here
27+
28+
# ── 卡商 EFun(aimizy bindcard)接口版(可选) ───────────────
29+
# vendor_efun 模式接口地址(默认 https://card.aimizy.com/api/v1/bindcard)
30+
# VENDOR_BINDCARD_API_URL=https://card.aimizy.com/api/v1/bindcard
31+
32+
# vendor_efun 模式接口 Bearer Token
33+
# VENDOR_BINDCARD_API_KEY=your_vendor_api_key_here

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ jobs:
2525
- os: ubuntu-latest
2626
source_name: codex-console
2727
asset_name: codex-console-linux-x64
28+
- os: ubuntu-24.04-arm
29+
source_name: codex-console
30+
asset_name: codex-console-linux-arm64
2831
- os: macos-latest
2932
source_name: codex-console
3033
asset_name: codex-console-macos-arm64
34+
- os: macos-26-intel
35+
source_name: codex-console
36+
asset_name: codex-console-macos-amd64
3137

3238
steps:
3339
- name: Checkout code
@@ -89,8 +95,10 @@ jobs:
8995
| Platform | File |
9096
|------|------|
9197
| Windows x64 | `codex-console-windows-x64.exe` |
98+
| Linux ARM64 | `codex-console-linux-arm64` |
9299
| Linux x64 | `codex-console-linux-x64` |
93100
| macOS ARM64 | `codex-console-macos-arm64` |
101+
| macOS AMD64 | `codex-console-macos-amd64` |
94102
95103
### Usage
96104
```bash

.github/workflows/tests.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Python Tests
2+
3+
on:
4+
push:
5+
branches: ["main", "master"]
6+
pull_request:
7+
branches: ["main", "master"]
8+
workflow_dispatch:
9+
10+
jobs:
11+
pytest:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
17+
- name: Setup Python
18+
uses: actions/setup-python@v5
19+
with:
20+
python-version: "3.11"
21+
cache: "pip"
22+
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install --upgrade pip
26+
pip install -r requirements.txt
27+
pip install pytest httpx
28+
29+
- name: Run tests
30+
run: |
31+
pytest -q

PR_DESCRIPTION.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# PR 说明(codex-console2 -> codex-console)
2+
3+
## 结论摘要
4+
本次 PR 基于 `K:\github\codex-console2` 对比原仓库 `K:\github\codex-console`,当前实际代码差异为 **1 项**
5+
- 删除 GitHub Actions 工作流文件:`.github/workflows/docker-publish.yml`
6+
7+
除上述文件外,其余同名文件内容一致(按全量哈希比对)。
8+
9+
## 修改方案
10+
### 目标
11+
- 清理不需要的镜像发布流水线配置,保持当前仓库 CI 行为可控。
12+
13+
### 实施内容
14+
- 移除:`.github/workflows/docker-publish.yml`
15+
16+
## 涉及文件
17+
- 删除文件:`.github/workflows/docker-publish.yml`
18+
19+
## 影响范围
20+
### 直接影响
21+
- 仓库将不再触发该文件定义的 Docker 发布工作流。
22+
23+
### 间接影响
24+
- 如果团队仍依赖该 workflow 进行镜像发布,发布链路会中断;需改由其它 workflow 或手动流程执行。
25+
26+
## 验证结果
27+
- 已完成目录级全量比对(`K:\github\codex-console2` vs `K:\github\codex-console`):
28+
- 同名文件:108
29+
- 同名文件内容差异:0
30+
- 新增文件:0
31+
- 删除文件:1(即上述 workflow 文件)
32+
33+
## 回滚方案
34+
如需回滚本次变更:
35+
1. 从原仓库 `K:\github\codex-console` 恢复 `.github/workflows/docker-publish.yml`
36+
2. 提交回滚 commit 并重新触发 CI 验证。
37+
38+
## 风险评估
39+
- 风险等级:低(仅 CI 配置变更)
40+
- 关注点:确认团队当前是否仍需要该 Docker 发布流水线。
41+
42+
## 建议的 PR 标题
43+
- `chore(ci): remove docker-publish workflow`
44+
45+
## 建议的 Commit Message
46+
- `chore(ci): remove .github/workflows/docker-publish.yml`

0 commit comments

Comments
 (0)