-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
11 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,10 +7,8 @@ on: | |
workflow_dispatch: | ||
|
||
jobs: | ||
rebase-development-onto-main: | ||
sync-branches: | ||
runs-on: ubuntu-latest | ||
permissions: | ||
contents: write | ||
|
||
steps: | ||
- name: Checkout repository | ||
|
@@ -23,6 +21,15 @@ jobs: | |
git config user.name "GitHub Actions Bot" | ||
git config user.email "[email protected]" | ||
- name: Setup SSH Keys and known_hosts | ||
env: | ||
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} | ||
run: | | ||
mkdir -p ~/.ssh | ||
echo "$DEPLOY_KEY" > ~/.ssh/id_ed25519 | ||
chmod 600 ~/.ssh/id_ed25519 | ||
ssh-keyscan github.com >> ~/.ssh/known_hosts | ||
- name: Fetch all branches | ||
run: git fetch origin | ||
|
||
|
@@ -38,7 +45,7 @@ jobs: | |
run: | | ||
git checkout main | ||
git merge development --ff-only | ||
git push origin main | ||
git push [email protected]:${GITHUB_REPOSITORY}.git main | ||
- name: Handle rebase conflicts | ||
if: failure() | ||
|