xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 7 Wiki Activity

fix(ci): 修复deploy脚本retry_docker_login引号嵌套问题 (#593) #622

Merged
auto-approve-bot merged 1 commits from ci/fix-593-bugs into develop 2026-07-20 01:34:32 +08:00
Conversation 4 Commits 1 Files Changed 2
+4 -2
xiaoxia commented 2026-07-20 01:29:14 +08:00
Owner
Copy Link
Copy Source

修复内容

Bug 1: Deploy脚本retry_docker_login引号嵌套问题

  • 影响文件: scripts/ci_staging_deploy.sh, scripts/ci_production_deploy.sh
  • 问题: retry_docker_login() 函数中 sh -c "...$VAR..." 双引号嵌套导致变量解析异常，token含特殊字符时docker login失败
  • 修复: export变量 + 单引号包裹sh -c命令，确保子shell正确读取环境变量

Bug 2: ACR cleanup 参数对齐

  • 排查中...
## 修复内容 ### Bug 1: Deploy脚本retry_docker_login引号嵌套问题 - **影响文件**: `scripts/ci_staging_deploy.sh`, `scripts/ci_production_deploy.sh` - **问题**: `retry_docker_login()` 函数中 `sh -c "...$VAR..."` 双引号嵌套导致变量解析异常，token含特殊字符时docker login失败 - **修复**: export变量 + 单引号包裹sh -c命令，确保子shell正确读取环境变量 ### Bug 2: ACR cleanup 参数对齐 - 排查中...
xiaoxia added 1 commit 2026-07-20 01:29:14 +08:00
fix(ci): 修复deploy脚本retry_docker_login引号嵌套问题 (#593)
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 33s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m1s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m9s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m19s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m11s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m46s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m14s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 5m16s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 23s
Details
AI Code Review / AI Code Review (pull_request) Successful in 7m55s
Details
5a8c55a471
gitea-actions bot commented 2026-07-20 01:30:17 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #622
预览链接 https://pr-622.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #622 | | 预览链接 | [https://pr-622.preview.xiaoxiajianji.com](https://pr-622.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot approved these changes 2026-07-20 01:33:02 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-07-20 01:33:02 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit 61d7b14635 into develop 2026-07-20 01:34:32 +08:00
auto-approve-bot deleted branch ci/fix-593-bugs 2026-07-20 01:34:32 +08:00
gitea-actions bot commented 2026-07-20 01:34:55 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #622 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #622 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#622
Delete Branch "ci/fix-593-bugs"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?