feat: Add five points

ciandt-china-dev · Jan 9, 2025 · 606ebe3 · 606ebe3
1 parent e0b008a
commit 606ebe3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/env_approval.yml b/.github/workflows/env_approval.yml
@@ -86,18 +86,28 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const services = ${{ needs.detect-changes.outputs.affected_services || '[]' }};
-            console.log('Detected services:', services);
+            // 获取检测到的服务
+            const detectedServices = ${{ needs.detect-changes.outputs.affected_services || '[]' }};
+            console.log('Detected services:', detectedServices);
             
-            if (services.length === 0 && '${{ github.event_name }}' === 'push') {
+            // 处理手动触发的情况
+            const isManualTrigger = '${{ github.event_name }}' === 'workflow_dispatch';
+            const manualSelection = '${{ github.event.inputs.services }}';
+            
+            let selectedServices;
+            if (isManualTrigger) {
+              // 如果是手动触发
+              selectedServices = manualSelection === 'all' ? detectedServices : [manualSelection];
+            } else {
+              // 如果是自动触发（push 事件）
+              selectedServices = detectedServices;
+            }
+            
+            if (selectedServices.length === 0 && '${{ github.event_name }}' === 'push') {
               core.setFailed('No service changes detected');
               return;
             }
             
-            const selectedServices = '${{ github.event.inputs.services }}' === 'all' 
-              ? services 
-              : ['${{ github.event.inputs.services }}'];
-            
             console.log('Selected services for deployment:', selectedServices);
             core.setOutput('selected_services', JSON.stringify(selectedServices));
 

diff --git a/backend/src/index.js b/backend/src/index.js
@@ -9,7 +9,7 @@ const PORT = process.env.PORT || 3000;
 
 // 触发GitHub repository dispatch事件的函数
 async function triggerGithubDispatch(owner, repo, token) {
-  console.log(`[${new Date().toISOString()}] 开始触发GitHub Dispatch事件....`);
+  console.log(`[${new Date().toISOString()}] 开始触发GitHub Dispatch事件.....`);
   console.log(`[${new Date().toISOString()}] 目标仓库: ${owner}/${repo}`);
 
   try {