ci: configure git user for committing latest_translation_commit.json … (#21409)

Author: shhdgit

.github/workflows/translation-zh-switch.yaml

@@ -38,10 +38,55 @@ jobs:
           git push origin "${{ github.event.inputs.to }}"
           cd ..
 
+      - name: Force merge to_base branch excluding tidb-cloud folder
+        run: |
+          cd docs
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+          # Fetch the to_base branch
+          git fetch origin "${{ github.event.inputs.to_base }}"
+
+          # Simple and reliable approach: merge everything first, then restore tidb-cloud
+
+          # Store the current target branch state before merge
+          TARGET_BRANCH_HEAD=$(git rev-parse HEAD)
+
+          # Create a temporary branch from to_base
+          git checkout -b temp-merge-branch "origin/${{ github.event.inputs.to_base }}"
+
+          # Switch back to target branch
+          git checkout "${{ github.event.inputs.to }}"
+
+          # Merge the temporary branch with allow-unrelated-histories
+          git merge temp-merge-branch --no-edit --allow-unrelated-histories -X theirs
+
+          # After merge, restore tidb-cloud folder from the original target branch state
+          # Use the stored commit hash to restore the original tidb-cloud folder
+          git checkout $TARGET_BRANCH_HEAD -- tidb-cloud/ || true
+
+          # If there are any conflicts in tidb-cloud, resolve them by keeping the target branch version
+          git add tidb-cloud/ || true
+
+          # Clean up temporary branch
+          git branch -D temp-merge-branch
+
+          # Get the latest filterCloudInitFiles.js from master branch
+          git fetch origin master
+          git checkout origin/master -- scripts/filterCloudInitFiles.js || true
+
+          # Push the changes
+          git push origin "${{ github.event.inputs.to }}"
+          cd ..
+
       - name: Update latest_translation_commit.json
         run: |
           cd docs
-          echo '{"target":"${{ github.event.inputs.to_base }}","sha":""}' > latest_translation_commit.json
+          # Get the latest commit SHA from to_base branch
+          TO_BASE_SHA=$(git rev-parse origin/${{ github.event.inputs.to_base }})
+          echo '{"target":"${{ github.event.inputs.to_base }}","sha":"'$TO_BASE_SHA'"}' > latest_translation_commit.json
+          git config user.name github-actions
+          git config user.email github-actions@github.com
           git add latest_translation_commit.json
           git commit -m "ci: update latest_translation_commit.json for ${{ github.event.inputs.to_base }}"
           git push origin "${{ github.event.inputs.to }}"
@@ -60,7 +105,7 @@ jobs:
           export GH_TOKEN=${{github.token}}
           cd docs
           npm i
-          node scripts/filterUpdateFiles.js --cloud --init
+          node scripts/filterCloudInitFiles.js
           tree tmp
           cd ..
 

scripts/filterCloudInitFiles.js

@@ -0,0 +1,78 @@
+import * as fs from "fs";
+import path from "path";
+
+// Read the TOC file
+const tocContent = fs.readFileSync("TOC-tidb-cloud.md", "utf8");
+
+// Regular expression to match markdown links
+const linkRegex = /\[([^\]]+)\]\(([^)]+)\)/g;
+
+// Set to store unique file paths
+const filePaths = new Set();
+
+// Extract all file paths from markdown links
+let match;
+while ((match = linkRegex.exec(tocContent)) !== null) {
+  const filePath = match[2];
+
+  // Skip external links (starting with http/https)
+  if (filePath.startsWith("http")) {
+    continue;
+  }
+
+  // Skip anchor links (starting with #)
+  if (filePath.startsWith("#")) {
+    continue;
+  }
+
+  // Remove leading slash if present
+  const cleanPath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
+
+  // Skip files in tidb-cloud folder
+  if (cleanPath.startsWith("tidb-cloud/")) {
+    continue;
+  }
+
+  filePaths.add(cleanPath);
+}
+
+// Create tmp directory if it doesn't exist
+const tmpDir = "tmp";
+if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, { recursive: true });
+}
+
+// Copy files to tmp directory
+let copiedCount = 0;
+let skippedCount = 0;
+
+for (const filePath of filePaths) {
+  const sourcePath = filePath;
+  const targetPath = path.join(tmpDir, filePath);
+
+  // Create target directory if it doesn't exist
+  const targetDir = path.dirname(targetPath);
+  if (!fs.existsSync(targetDir)) {
+    fs.mkdirSync(targetDir, { recursive: true });
+  }
+
+  // Check if source file exists
+  if (fs.existsSync(sourcePath)) {
+    try {
+      fs.copyFileSync(sourcePath, targetPath);
+      console.log(`✓ Copied: ${filePath}`);
+      copiedCount++;
+    } catch (error) {
+      console.error(`✗ Error copying ${filePath}: ${error.message}`);
+    }
+  } else {
+    console.log(`⚠ Skipped (not found): ${filePath}`);
+    skippedCount++;
+  }
+}
+
+console.log(`\nSummary:`);
+console.log(`- Total files referenced: ${filePaths.size}`);
+console.log(`- Files copied: ${copiedCount}`);
+console.log(`- Files skipped: ${skippedCount}`);
+console.log(`- Files copied to: ${tmpDir}/`);