Merge upstream branch

This workflow is used to automatically merge in the upstream branch of a repository following the Bonita platform lifecycle.

Usage

name: Merge Upstream

on:
  workflow_dispatch: 
  push:
    branches: 
      - '[0-9]+.[0-9]+.x'
      - 'master'
      - 'release-*'

jobs:
  merge-upstream:
    uses: bonitasoft/github-workflows/.github/workflows/_reusable_merge_upstream.yml@main
    secrets: inherit

NOTE: The upstream branch is determined using the SUPPORTED_BRANCHES organization variable. This variable has to be maintained properly when support versions are removed or added.

When a merge operation is in conflict a pull request is opened in conflict and assigned to the last known commit author.

Contributors

@rbioteau

References

_reusable_merge_upstream.yml