Merge pull request #62 from ttakuya50/release/20200508_14

Release 20200508_14
ttakuya50 · May 8, 2020 · 3585023 · 3585023
2 parents aa36cd5 + 3fc9732
commit 3585023
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,12 +38,12 @@ jobs:
           git push origin "${{ env.TAGNAME }}"
       - name: develop merge
         run: |
-          git fetch -q origin develop
           git checkout ${{ github.head_ref }}
           git checkout develop
-          git merge --no-ff ${{ github.head_ref }}
+          git merge --no-ff -m "Merge tag ${{ env.TAGNAME }} into develop" ${{ github.head_ref }}
           git push origin develop
 #          git fetch -q origin develop
+#          git fetch -q origin develop
 #          git fetch -q origin ${{ github.head_ref }}
 #          git push origin HEAD:develop
 #          git merge --allow-unrelated-histories --no-ff -m "Merge tag ${{ env.TAGNAME }} into develop" "${{ env.TAGNAME }}"