2023-08-29 00:40:49 +08:00
|
|
|
name: Merge branches
|
|
|
|
runs:
|
2024-08-14 10:48:18 +08:00
|
|
|
using: composite
|
2023-08-29 00:40:49 +08:00
|
|
|
steps:
|
|
|
|
- name: Checkout ${{ github.event.pull_request.base.ref || 'master' }}
|
2024-03-11 23:28:35 +08:00
|
|
|
uses: actions/checkout@v4
|
2023-08-29 00:40:49 +08:00
|
|
|
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 }}
|