Adjust config manifest.json and hacs.json #10
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: 'Automatically merge master -> dev' | |
| on: | |
| push: | |
| branches: | |
| - master | |
| jobs: | |
| build: | |
| name: Automatically merge master to dev | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v3 | |
| name: Git checkout | |
| with: | |
| fetch-depth: 0 | |
| - name: Merge master -> dev | |
| run: | | |
| git config user.name "GitHub Actions" | |
| git config user.email "[email protected]" | |
| if (git checkout dev) | |
| then | |
| git merge --ff-only master || git merge --no-commit master | |
| git commit -m "Automatically merge master -> dev" || echo "No commit needed" | |
| git push origin dev | |
| else | |
| echo "No dev branch" | |
| fi |