Skip to content
This repository was archived by the owner on Mar 23, 2021. It is now read-only.

Commit ebaabd9

Browse files
Merge pull request #3306 from comit-network/release/nectar/0.1.0
2 parents 67c9ed7 + 154159c commit ebaabd9

37 files changed

+1010
-705
lines changed

.github/workflows/merge-release-branch-back-into-dev.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ jobs:
1313
name: Merge release-branch back into dev
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Create pull request for merging release-branch back into dev
16+
- name: Create pull request for merging master back into dev
1717
uses: thomaseizinger/create-pull-request@1.0.0
1818
with:
1919
GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }}
20-
head: ${{ github.event.pull_request.head.ref }}
20+
head: master
2121
base: dev
22-
title: Merge `${{ github.event.pull_request.head.ref }}` into `dev`
22+
title: Merge `master` into `dev`
2323
body: |
24-
This PR merges the `${{ github.event.pull_request.head.ref }}` branch back into `dev`.
24+
This PR merges the `master` branch back into `dev`.
2525
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
26+
Otherwise, GitHub will "complain" that the next release branch is not up to date with master because it is missing the merge commit from the last release.

0 commit comments

Comments
 (0)