能否实现外部Git仓库与Azure DevOps内部仓库的每日自动同步？

Absolutely, you can set up daily automatic sync between your internal Azure DevOps Git repo (forked from an external open-source project) and the original upstream repo. Let’s walk through two reliable ways to make this happen—using Azure DevOps’ built-in tools first, then a custom script approach if you need more flexibility.

Azure DevOps Built-In Pipeline Solution #

This is the most integrated approach since it uses Azure DevOps native features, no external tools required. Here’s how to set it up:

1. Add the upstream repo as a remote in your internal repo

   • Go to your internal Azure DevOps repo’s Settings > Repositories > Add repository
   • Choose "Import a repository", paste the external open-source repo’s Git URL, and name it something like upstream (this lets your repo track the original source)

2. Create a scheduled YAML pipeline

   • Navigate to Pipelines > New Pipeline and select your internal repo
   • Choose "Starter pipeline" and replace the default YAML with this template (adjust values to match your setup):

     # Disable triggers on code commits—we only want daily scheduled runs
     trigger: none
     
     schedules:
     - cron: "0 0 * * *" # Runs every day at midnight UTC; tweak the cron expression for your timezone/schedule
       displayName: Daily upstream sync
       branches:
         include:
         - main # Replace with your internal repo's main branch name
       always: true # Runs even if there are no code changes in the internal repo
     
     pool:
       vmImage: 'ubuntu-latest' # Uses a hosted Ubuntu agent; you can use Windows if preferred
     
     steps:
     - checkout: self
       persistCredentials: true # Keeps Azure DevOps credentials to push changes back
     
     - script: |
         # Add upstream remote (ignore errors if it already exists)
         git remote add upstream <EXTERNAL_UPSTREAM_REPO_URL> || true
         git fetch upstream
         git checkout main
         # Merge upstream changes without prompting for a commit message
         git merge upstream/main --no-edit
         git push origin main
       displayName: 'Sync upstream changes to internal repo'
     

   • Save and run the pipeline to test it out

Key Notes: #

• Conflict Handling: If there are merge conflicts between your internal changes and the upstream repo, the pipeline will fail. You’ll need to manually resolve the conflicts in your internal repo, then re-run the pipeline.
• Notifications: Set up pipeline alerts in Azure DevOps to get notified if the sync fails—this way your team can address conflicts quickly.

Custom Script Approach (For Advanced Flexibility) #

If you need more control over the sync logic (like custom conflict resolution, or syncing multiple branches), you can use a bash/PowerShell script and host it in Azure DevOps pipelines (or even Azure Automation Runbooks). Here’s a sample bash script:

#!/bin/bash

# Configure your repo details
INTERNAL_REPO_URL="https://dev.azure.com/your-org/your-project/_git/your-internal-repo"
UPSTREAM_REPO_URL="<EXTERNAL_UPSTREAM_REPO_URL>"
TARGET_BRANCH="main"

# Create a temporary directory to work in
mkdir -p temp-sync-repo
cd temp-sync-repo

# Clone the internal repo (uses Azure DevOps credentials if run in a pipeline)
git clone $INTERNAL_REPO_URL .

# Add upstream remote and pull latest changes
git remote add upstream $UPSTREAM_REPO_URL
git fetch upstream

# Checkout target branch and merge upstream changes
git checkout $TARGET_BRANCH
git merge upstream/$TARGET_BRANCH --no-edit

# Push merged changes back to internal repo
git push origin $TARGET_BRANCH

# Clean up temporary files
cd ..
rm -rf temp-sync-repo

To use this script:

• Add it to your internal Azure DevOps repo (e.g., in a scripts/ folder)
• Create a scheduled pipeline that runs this script using the same scheduled trigger setup as the built-in solution above

This approach lets you tweak the sync logic—for example, adding flags to handle conflicts automatically (like git merge -X theirs to accept upstream changes) or syncing multiple branches in one run.

内容的提问来源于stack exchange，提问作者Deepak Bolla