Merge 09d04ef into master

nakamasato · Mar 8, 2020 · bc68f4d · bc68f4d
2 parents 2f10bee + 09d04ef
commit bc68f4d
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/.github/workflows/branch-and-tag.yml b/.github/workflows/branch-and-tag.yml
@@ -0,0 +1,21 @@
+name: branch & tag
+
+on:
+  push:
+    branch:
+    - merge
+    tags:
+    - v1.*
+
+jobs:
+  merge-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Merge to master branch
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          target_branch: 'master'
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}