From 393d8c7c37591b0b6ff1f5fa6af7db9beb99e9e5 Mon Sep 17 00:00:00 2001 From: zhuchao Date: Tue, 24 Feb 2026 04:38:05 +0000 Subject: [PATCH 1/3] chore: add .worktrees/ to .gitignore Co-Authored-By: Claude Opus 4.6 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e300b2e..bbf8dae 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,7 @@ projects/queue_data worktree .idea/* +# Git worktrees +.worktrees/ + .idea/ From 0a6ec955185ccba3fc7ee842bb0a33ceff16d3ca Mon Sep 17 00:00:00 2001 From: shuirong Date: Mon, 16 Mar 2026 16:18:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat(CI):=20=E6=B7=BB=E5=8A=A0=20onprem-dev?= =?UTF-8?q?=20=E7=8E=AF=E5=A2=83=E7=9A=84=E6=9E=84=E5=BB=BA=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 CircleCI 配置中新增 onprem-dev 环境的 build-and-push 和 deploy 任务，部署到 cluster-for-B 的 onprem-dev 命名空间 Co-Authored-By: Claude Opus 4.6 (1M context) --- .circleci/config.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0a1532..d0b7173 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -193,3 +193,30 @@ workflows: branches: only: - onprem + # 为 onprem-dev 环境部署 + - build-and-push: + name: build-for-onprem-dev + context: + - ecr-new + path: . + dockerfile: Dockerfile + repo: catalog-agent + docker-tag: '' + filters: + branches: + only: + - onprem + - deploy: + name: deploy-for-onprem-dev + docker-tag: '' + path: '/home/ubuntu/cluster-for-B/onprem-dev/catalog-agent/deploy.yaml' + deploy-name: catalog-agent + deploy-namespace: onprem-dev + context: + - ecr-new + filters: + branches: + only: + - onprem + requires: + - build-for-onprem-dev From 822589eab663e183c34c492d1ebc28ad53187dda Mon Sep 17 00:00:00 2001 From: shuirong Date: Wed, 18 Mar 2026 16:16:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4C?= =?UTF-8?q?I?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0b7173..0d541a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,7 +108,7 @@ workflows: filters: branches: only: - - master + - dev - deploy: name: deploy-for-test docker-tag: '' @@ -120,7 +120,7 @@ workflows: filters: branches: only: - - master + - dev requires: - build-for-test - build-and-push: @@ -183,7 +183,7 @@ workflows: filters: branches: only: - - onprem + - onprem-release - docker-hub-build-push: name: docker-hub-build-push-arm repo: gptbasesparticle/catalog-agent @@ -192,7 +192,7 @@ workflows: filters: branches: only: - - onprem + - onprem-release # 为 onprem-dev 环境部署 - build-and-push: name: build-for-onprem-dev @@ -205,7 +205,7 @@ workflows: filters: branches: only: - - onprem + - onprem-dev - deploy: name: deploy-for-onprem-dev docker-tag: '' @@ -217,6 +217,6 @@ workflows: filters: branches: only: - - onprem + - onprem-dev requires: - build-for-onprem-dev