finalize cleanup powershell scripts #432
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
name: Forward Commits to Bleeding-Edge | |
on: | |
push: | |
branches: | |
- '*' | |
- '!bleeding-edge' | |
jobs: | |
merge: | |
runs-on: ubuntu-latest | |
if: contains(github.event.head_commit.message, '[skip-edge]') == false | |
steps: | |
- name: Checkout Repository | |
uses: actions/checkout@v2 | |
with: | |
fetch-depth: 0 # Fetches all history for all branches and tags | |
- name: Configure Git Identity | |
run: | | |
git config --global user.name "GitHub Action" | |
git config --global user.email "[email protected]" | |
- name: Cherry-Pick to Bleeding-Edge | |
run: | | |
git checkout bleeding-edge | |
# Attempt to cherry-pick and resolve conflicts by favoring incoming changes | |
git cherry-pick ${{ github.sha }} || true | |
# If there were conflicts, add all and continue | |
if git status | grep -q 'Unmerged paths'; then | |
git add . | |
git cherry-pick --continue | |
fi | |
git push origin bleeding-edge |