bigbluebutton-Github/.github/actions/merge-branches/action.yml
Anton Barboza de Sá c6e8464693
core: Makes CI read the needed data from an uploaded file when the tests finish (#20810)
* core: get PR number from artifacts on completed testing workflow

* core: split merge and upload blob-report action into a separate file

* ci: do not remove artifact files
2024-08-13 23:48:18 -03:00

17 lines
677 B
YAML

name: Merge branches
runs:
using: composite
steps:
- name: Checkout ${{ github.event.pull_request.base.ref || 'master' }}
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.base.ref || '' }}
fetch-depth: 0 # Fetch all history
- name: Merge pr-${{ github.event.number }} into ${{ github.event.pull_request.base.ref }}
if: github.event_name == 'pull_request'
shell: bash
run: |
git config user.name "BBB Automated Tests"
git config user.email "tests@bigbluebutton.org"
git config pull.rebase false
git pull origin pull/${{ github.event.number }}/head:${{ github.head_ref }}