integrate slapd-cli 3.5 + prepare release 2.6.9 (#116 #118) #53
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: Sync Back to master | |
| on: | |
| push: | |
| branches: | |
| - openldap26 | |
| jobs: | |
| sync-branches: | |
| runs-on: ubuntu-latest | |
| name: Syncing branches | |
| steps: | |
| - uses: actions/checkout@v2 | |
| with: | |
| ref: openldap26 | |
| - run: | | |
| git fetch --unshallow | |
| git pull origin openldap26 | |
| git config user.email "[email protected]" | |
| git config user.name "GitHub Actions" | |
| - name: sync master | |
| run: | | |
| git checkout master | |
| git pull --rebase | |
| git merge openldap26 --ff-only | |
| git push |