39406d0d42
This fixes several CI warnings like this one:
Node.js 16 actions are deprecated.
Please update the following actions to use Node.js 20: actions/checkout@v3,
actions/cache@v3, actions/upload-artifact@v3. For more information see:
https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update more GitHub actions from v3 to v4
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Change upload and download to work with v4
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update GitHub action eps1lon/actions-label-merge-conflict
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update GitHub action nick-fields/retry
Signed-off-by: Stefan Weil <sw@weilnetz.de>
20 lines
701 B
YAML
20 lines
701 B
YAML
name: Merge branches
|
|
on:
|
|
workflow_call:
|
|
|
|
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 }} |