Merge pull request #261 from EstrellaXD/2.6-dev

2.6.10

.github/workflows/dev-latest.yml

@@ -2,8 +2,6 @@ name: Deploy To Dockerhub(dev)
 
 on:
   push:
-    branches:
-      - '*-dev'
     tags:
       - '\d+\.\d+\.\d+-beta\d+'
       - '\d+\.\d+-beta\d+'

.github/workflows/release.yml

@@ -10,9 +10,9 @@ on:
 jobs:
   generate_release_draft:
     runs-on: ubuntu-latest
-    if:
-      - github.event.pull_request.merged == true
-      - github.event.pull_request.base.ref == 'main'
+    if: >
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.base.ref == 'main'
     steps:
       - name: Checkout code
         uses: actions/checkout@v2