Merge pull request #1749 from tgstation/FixDiscordNoAccess [NugetDepl… #470
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: 'Master Merge' | |
| on: | |
| push: | |
| branches: | |
| - master | |
| jobs: | |
| master-merge: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout | |
| uses: actions/checkout@v1 | |
| - name: Merge master into dev | |
| uses: robotology/gh-action-nightly-merge@22f5e45d028f22837d617fa07512925457eec184 #v1.3.3 | |
| with: | |
| stable_branch: 'master' | |
| development_branch: 'dev' | |
| allow_ff: true | |
| allow_forks: true | |
| user_name: tgstation-server | |
| user_email: [email protected] | |
| push_token: DEV_PUSH_TOKEN | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| DEV_PUSH_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} |