Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add option for where to force push #31

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −2
Open

feat: add option for where to force push #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
366f0c6
feat: add option for where to force push
Rory-Z Mar 5, 2021
1caa7ba
Update git-sync.sh
Rory-Z Oct 2, 2022
ef6ef8b
Update README.md
Rory-Z Oct 2, 2022
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
source_branch: "main"
destination_repo: "destination_org/repository"
destination_branch: "main"
destination_force_push: "1" # optional, whether to force push to destination
Rory-Z marked this conversation as resolved.
Show resolved Hide resolved
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} # optional
source_ssh_private_key: ${{ secrets.SOURCE_SSH_PRIVATE_KEY }} # optional, will override `SSH_PRIVATE_KEY`
destination_ssh_private_key: ${{ secrets.DESTINATION_SSH_PRIVATE_KEY }} # optional, will override `SSH_PRIVATE_KEY`
Expand Down
6 changes: 5 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ inputs:
destination_branch:
description: Branch name to sync to
required: true
destination_force_push:
description: Whether to force push to destination
required: false
ssh_private_key:
description: SSH key used to authenticate with source and destination ssh urls provided (optional if public or https url with authentication)
required: false
Expand All @@ -37,4 +40,5 @@ runs:
- ${{ inputs.source_repo }}
- ${{ inputs.source_branch }}
- ${{ inputs.destination_repo }}
- ${{ inputs.destination_branch }}
- ${{ inputs.destination_branch }}
- ${{ inputs.destination_force_push }}
7 changes: 6 additions & 1 deletion git-sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ SOURCE_REPO=$1
SOURCE_BRANCH=$2
DESTINATION_REPO=$3
DESTINATION_BRANCH=$4
DESTINATION_FORCE_PUSH=$5
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable is unused.


if ! echo $SOURCE_REPO | grep -Eq ':|@|\.git\/?$'; then
if [[ -n "$SSH_PRIVATE_KEY" || -n "$SOURCE_SSH_PRIVATE_KEY" ]]; then
Expand Down Expand Up @@ -48,4 +49,8 @@ if [[ -n "$DESTINATION_SSH_PRIVATE_KEY" ]]; then
git config --local core.sshCommand "/usr/bin/ssh -i ~/.ssh/dst_rsa"
fi

git push destination "${SOURCE_BRANCH}:${DESTINATION_BRANCH}" -f
if [[ -n "$SOURCE_SSH_PRIVATE_KEY" ]]; then
Rory-Z marked this conversation as resolved.
Show resolved Hide resolved
git push destination "${SOURCE_BRANCH}:${DESTINATION_BRANCH}" -f
else
git push destination "${SOURCE_BRANCH}:${DESTINATION_BRANCH}"
fi