Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ on:
warp_api_key:
description: "Warp API key."
required: true
ssh_key:
description: "Optional SSH private key for accessing private dependencies (e.g. private crates) during the setup command."
required: false

concurrency:
group: repo-sync-${{ github.repository == inputs.private_repo && 'private-to-public' || 'public-to-private' }}-${{ github.repository }}-${{ github.repository == inputs.private_repo && inputs.public_repo || inputs.private_repo }}
Expand Down Expand Up @@ -117,6 +120,12 @@ jobs:
- name: Build conflict resolution agent image
run: docker build -f .repo-sync/docker/conflict-resolution/Dockerfile -t repo-sync-conflict-resolution .repo-sync

- name: Setup SSH keys
if: secrets.ssh_key != ''
uses: webfactory/ssh-agent@v0.7.0
with:
ssh-private-key: ${{ secrets.ssh_key }}

- name: Run setup command
if: inputs.setup_command != ''
run: ${{ inputs.setup_command }}
Expand Down
2 changes: 2 additions & 0 deletions examples/consuming-repo-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
# public_to_private_fixup_script: scripts/post-cherry-pick-fixup.sh
secrets:
app_private_key: ${{ secrets.REPO_SYNC_APP_PRIVATE_KEY }}
# Optional SSH key for fetching private dependencies during setup.
# ssh_key: ${{ secrets.REPO_SYNC_SSH_KEY }}

# -----------------------------------------------------------------------
# Restack: triggered when a sync PR is merged.
Expand Down