Fix rule

Dontrian · Dec 4, 2023 · 8e85d9e · 8e85d9e
1 parent eb0fa81
commit 8e85d9e
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/only-allow-pull-requests-to-master-from-develop.yml b/.github/workflows/only-allow-pull-requests-to-master-from-develop.yml
@@ -6,17 +6,22 @@ on:
 
 jobs:    
   bump-version:
-    name: Is pull request from develop
+    name: Is pull request from develop (or master)
 
     runs-on: ubuntu-latest #self-hosted
 
     steps:
-    - name: Check that pull request is from develop
+    - name: Check that pull request is from develop or master
       run: |
         if [ "${{github.head_ref}}" == "develop" ]; then
-          echo Pull request is from develop ✔
+        echo Pull request is from develop ✔
+          exit 0
+        elif [ "${{github.head_ref}}" == "master" ]; then
+          echo Pull request is from master ✔
           exit 0
         else
           echo Pull requests from ${{github.head_ref}} are not allowed. Only pull requests from develop are allowed.
-          exit 1
         fi
+        
+        exit 1
+