Merge hotfix/bugreport into master

code20uk · Aug 11, 2021 · 3943e6f · 3943e6f
2 parents ec184d7 + 53829e6
commit 3943e6f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 18 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1.bug-report.yml b/.github/ISSUE_TEMPLATE/1.bug-report.yml
@@ -45,24 +45,24 @@ body:
       description: 'For example: 1.0.0'
     validations:
       required: true
-    - type: input
-      attributes:
-        label: What version of Node.js are you using?
-        description: 'For example: 12.0.0'
-      validations:
-        required: true
-    - type: input
-      attributes:
-        label: What browser (and version) are you using?
-        description: 'For example: Chrome, Safari'
-      validations:
-        required: true
-    - type: input
-        attributes:
-          label: What operating system (and version) are you using?
-          description: 'For example: macOS, Windows'
-        validations:
-          required: true
+  - type: input
+    attributes:
+      label: What version of Node.js are you using?
+      description: 'For example: 12.0.0'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: What browser (and version) are you using?
+      description: 'For example: Chrome, Safari'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: What operating system (and version) are you using?
+      description: 'For example: macOS, Windows'
+    validations:
+      required: true
   - type: textarea
     id: logs
     attributes:

diff --git a/.github/workflows/gitflow.yml b/.github/workflows/gitflow.yml
@@ -7,6 +7,24 @@ on:
       - develop
 jobs:
   automerge:
+    name: GitFlow AutoMerge
+    if: contains(github.event.pull_request.labels.*.name, 'gitflow') && contains('bloodf|alefbarbeli|domideimel|LiorLindvor|filrak|filipsobol|andrzejewsky|', github.actor)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Extract branch name
+        uses: mdecoleman/[email protected]
+        id: extract_branch
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: yanamura/git-flow-merge-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ steps.extract_branch.outputs.branch }}
+          develop_branch: "develop"
+          main_branch: "master"
+          tag: ${{ steps.extract_tag.outputs.tag }}
+  release:
     name: GitFlow Release AutoMerge
     if: contains(github.event.pull_request.labels.*.name, 'release') && contains('bloodf|alefbarbeli|domideimel|LiorLindvor|filrak|filipsobol|andrzejewsky|', github.actor)
     runs-on: ubuntu-latest