merge to master after release

camalot · Jun 10, 2021 · e2db77f · e2db77f
1 parent 1410dd2
commit e2db77f
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,4 +44,13 @@ jobs:
       with:
         artifacts: dist/*.zip
         name: ${{ steps.semvers.outputs.v_patch }}
+        tag: ${{ steps.semvers.outputs.v_patch }}
         token: "${{ github.token }}"
+    - uses: actions/checkout@master
+    - name: Merge develop -> master
+      uses: devmasx/merge-branch@v1.3.1
+      with:
+        type: now
+        from_branch: develop
+        target_branch: master
+        github_token: ${{ github.token }}