Repository navigation
fix(net): keep a dedicated onion listener when -bind is given and correct the bind release note #24836
Workflow file for this run
This file contains hidden or 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 | ||
|
Check warning on line 1 in .github/workflows/merge-check.yml
|
||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
| # Required so we can apply labels to PRs (labels go through the issues API) | ||
| issues: write | ||
| on: | ||
| push: | ||
| pull_request_target: | ||
| pull_request_review: | ||
| types: [submitted] | ||
| jobs: | ||
| check_merge: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v6 | ||
| 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: | | ||
| if [[ "${{ github.ref_name }}" == "master" ]]; then | ||
| echo "Already on master, no need to check --ff-only" | ||
| else | ||
| git fetch --no-tags origin master:master | ||
| if [[ "${{ github.event_name }}" == "pull_request"* ]]; then | ||
| git fetch --no-tags origin ${{ github.event.pull_request.base.ref }}:base_branch | ||
| git checkout base_branch | ||
| git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head | ||
| git checkout master | ||
| git merge --ff-only base_branch | ||
| else | ||
| git checkout master | ||
| git merge --ff-only ${{ github.sha }} | ||
| fi | ||
| fi | ||
| - name: add labels | ||
| uses: actions/github-script@v8 | ||
| if: failure() && github.event.pull_request | ||
| with: | ||
| script: | | ||
| await github.rest.issues.addLabels({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| issue_number: context.payload.pull_request.number, | ||
| labels: ['needs rebase'] | ||
| }); | ||
| - name: comment | ||
| uses: mshick/add-pr-comment@v3 | ||
| if: failure() | ||
| with: | ||
| message: | | ||
| This pull request has conflicts, please rebase. | ||
