diff options
| author | Gina Häußge <gina@octoprint.org> | 2022-10-12 14:02:10 +0300 |
|---|---|---|
| committer | Gina Häußge <gina@octoprint.org> | 2022-10-12 14:02:10 +0300 |
| commit | d94e13e9dc9c4ce8c003f244087a3df668134355 (patch) | |
| tree | 90602b5f00a482ae3ce4bf80b72472d87784cefe /.github | |
| parent | 27a576e352a9b3d9abee89ab92cd02012c0e39dd (diff) | |
👷 Auto merge staging/bugfix & .../maintenance if possible
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/nightly_merge.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml index 089f44c8c..56821fbc0 100644 --- a/.github/workflows/nightly_merge.yml +++ b/.github/workflows/nightly_merge.yml @@ -23,6 +23,24 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: 🔀 Merge staging/bugfix into maintenance + uses: robotology/gh-action-nightly-merge@v1.3.3 + with: + stable_branch: "staging/bugfix" + development_branch: "maintenance" + allow_ff: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: 🔀 Merge staging/maintenance into maintenance + uses: robotology/gh-action-nightly-merge@v1.3.3 + with: + stable_branch: "staging/bugfix" + development_branch: "maintenance" + allow_ff: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: 🔀 Merge maintenance into devel uses: robotology/gh-action-nightly-merge@v1.3.3 with: |