Merge #22976: scripted-diff: Rename overloaded int GetArg to GetIntArg #314
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: Check Merge Fast-Forward Only | |
| on: | |
| push: | |
| pull_request: | |
| jobs: | |
| check_merge: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout repository | |
| uses: actions/checkout@v3 | |
| with: | |
| fetch-depth: 0 | |
| - name: Set up Git | |
| run: | | |
| git config user.name "GitHub Action" | |
| git config user.email "noreply@example.com" | |
| - name: Check merge --ff-only | |
| run: | | |
| git fetch origin master:master | |
| git checkout master | |
| if [ "${{ github.event_name }}" == "pull_request" ]; then | |
| git merge --ff-only ${{ github.event.pull_request.head.sha }} | |
| else | |
| git merge --ff-only ${{ github.sha }} | |
| fi |