Merge pull request #2 from timurgaleev/fix-val

Fix val
timurgaleev · Aug 10, 2020 · 9eadc3d · 9eadc3d
2 parents c0222d3 + e6d6474
commit 9eadc3d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 73 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           ./build.sh
 
-      - name: Docker Build & Push to Docker Hub
+      - name: Docker Build & Push to DockerHub
         uses: timzu/act-docker@master
         with:
           args: --docker

diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: automatic merge
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      # - "status-success=ci/circleci"
+    actions:
+      merge:
+        method: merge
+        # method: rebase
+        # rebase_fallback: merge
+        # strict: smart
+      dismiss_reviews: {}
+      delete_head_branch: {}
diff --git a/.project b/.project