fix

.cnb.yml

@@ -1,4 +1,10 @@
 # .cnb.yml
+include:
+  - https://cnb.cool/kevisual/cnb/-/blob/main/.cnb/template.yml
+  - config:
+      env: 
+        TO_REPO: kevisual/cnb
+        TO_URL: git.xiongxiao.me
 $:
   vscode:
     - docker:
@@ -12,51 +18,38 @@ $:
       #   - name: pnpm install
       #     script: pnpm install
 
-.common_sync_to_gitea: &common_sync_to_gitea
-  services:
-    - docker
-  imports:
-    - https://cnb.cool/kevisual/env/-/blob/main/.env.development
+.common_env: &common_env
   env:
     TO_REPO: kevisual/cnb
     TO_URL: git.xiongxiao.me
-  stages:
-    - name: '显示 git remote'
-      script: git remote -v
-    - name: sync to gitea
-      image: tencentcom/git-sync
-      settings:
-        target_url: https://${TO_URL}/${TO_REPO}.git
-        auth_type: https
-        username: "oauth2"
-        password:  ${GITEA_TOKEN}
-        git_user: "abearxiong"
-        git_email: "xiongxiao@xiongxiao.me"
-        sync_mode: rebase
-        branch: main
-.common_sync_from_gitea: &common_sync_from_gitea
-  services:
-    - docker
-  imports:
-    - https://cnb.cool/kevisual/env/-/blob/main/.env.development
-  env:
-    TO_REPO: kevisual/cnb
-    TO_URL: git.xiongxiao.me
-  stages:
-    - name: '添加 gitea的origin'
-      script: |
-        git remote remove gitea 2>/dev/null || true
-        git remote add gitea https://oauth2:${GITEA_TOKEN}@${TO_URL}/${TO_REPO}.git
-    - name: '同步gitea代码到当前仓库'
-      script: git pull gitea main
-    - name: '提交到原本的origin'
-      script: git push origin main
 main:
   web_trigger_sync_to_gitea: 
-  - <<: *common_sync_to_gitea
+    - <<: *common_env
+      services: !reference  [.common_sync_to_gitea, services]
+      imports: !reference  [.common_sync_to_gitea, imports]
+      stages: !reference [.common_sync_to_gitea, stages]
+      
   web_trigger_sync_from_gitea:
-  - <<: *common_sync_from_gitea
+    - <<: *common_env
+      stages:
+        - name: "测试变量"
+          script: |
+            echo "TO_REPO: ${TO_REPO}"
+            echo "TO_URL: ${TO_URL}"
+            echo '从gitea同步'
   api_trigger_sync_to_gitea:
-  - <<: *common_sync_to_gitea
+    - <<: *common_env
+      stages:
+        - name: "测试变量"
+          script: |
+            echo "TO_REPO: ${TO_REPO}"
+            echo "TO_URL: ${TO_URL}"
+            echo '同步到gitea'
   api_trigger_sync_from_gitea:
-  - <<: *common_sync_from_gitea
+    - <<: *common_env
+      stages:
+        - name: "测试变量"
+          script: |
+            echo "TO_REPO: ${TO_REPO}"
+            echo "TO_URL: ${TO_URL}"
+            echo '同步到gitea'

.cnb/template.yml

@@ -0,0 +1,50 @@
+.common_sync_to_gitea: &common_sync_to_gitea
+  services:
+    - docker
+  imports:
+    - https://cnb.cool/kevisual/env/-/blob/main/.env.development
+  # env:
+  #   TO_REPO: kevisual/cnb
+  #   TO_URL: git.xiongxiao.me
+  stages:
+    - name: '显示 git remote'
+      script: git remote -v
+    - name: sync to gitea
+      image: tencentcom/git-sync
+      settings:
+        target_url: https://${TO_URL}/${TO_REPO}.git
+        auth_type: https
+        username: "oauth2"
+        password:  ${GITEA_TOKEN}
+        git_user: "abearxiong"
+        git_email: "xiongxiao@xiongxiao.me"
+        sync_mode: rebase
+        branch: main
+
+.common_sync_from_gitea: &common_sync_from_gitea
+  services:
+    - docker
+  imports:
+    - https://cnb.cool/kevisual/env/-/blob/main/.env.development
+  # env:
+  #   TO_REPO: kevisual/cnb
+  #   TO_URL: git.xiongxiao.me
+  stages:
+    - name: '添加 gitea的origin'
+      script: |
+        git remote remove gitea 2>/dev/null || true
+        git remote add gitea https://oauth2:${GITEA_TOKEN}@${TO_URL}/${TO_REPO}.git
+    - name: '同步gitea代码到当前仓库'
+      script: git pull gitea main
+    - name: '提交到原本的origin'
+      script: git push origin main
+
+# main:
+#   web_trigger_sync_to_gitea:
+#     - <<: *common_sync_to_gitea
+#   web_trigger_sync_from_gitea:
+#     - <<: *common_sync_from_gitea
+#   api_trigger_sync_to_gitea:
+#     - <<: *common_sync_to_gitea
+#   api_trigger_sync_from_gitea:
+#     - <<: *common_sync_from_gitea