Merge pull request #3306 from comit-network/release/nectar/0.1.0

comit-network · Oct 20, 2020 · ebaabd9 · ebaabd9
2 parents 67c9ed7 + 154159c
commit ebaabd9
Show file tree

Hide file tree

Showing 37 changed files with 1,010 additions and 705 deletions.
diff --git a/.github/workflows/merge-release-branch-back-into-dev.yml b/.github/workflows/merge-release-branch-back-into-dev.yml
@@ -13,13 +13,14 @@ jobs:
     name: Merge release-branch back into dev
     runs-on: ubuntu-latest
     steps:
-      - name: Create pull request for merging release-branch back into dev
+      - name: Create pull request for merging master back into dev
         uses: thomaseizinger/[email protected]
         with:
           GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }}
-          head: ${{ github.event.pull_request.head.ref }}
+          head: master
           base: dev
-          title: Merge `${{ github.event.pull_request.head.ref }}` into `dev`
+          title: Merge `master` into `dev`
           body: |
-            This PR merges the `${{ github.event.pull_request.head.ref }}` branch back into `dev`.
+            This PR merges the `master` branch back into `dev`.
             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.
+            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.