Merge pull request #3010 from dvoraen/action_fix

Action fix

.github/actions/setup-database/action.yml

@@ -13,7 +13,6 @@ description: "Activates the database server for the passed in service and ensure
 inputs:
   database:
     description: "Database service being initialized."
-    type: string
     required: true
 
 runs:
@@ -84,3 +83,4 @@ runs:
     - name: Check running containers
       if: ${{ inputs.database == 'postgresql' || inputs.database == 'mysql' }}
       run: docker ps -a
+      shell: bash

.github/workflows/github_action_test_suite.yml

@@ -107,7 +107,7 @@ jobs:
     name: Deploy Docker Image
     needs: test
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'evennia/evennia' }}
+    if: ${{ github.repository == 'evennia/evennia' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') }}
     steps:
       - uses: actions/checkout@v3
 
@@ -118,7 +118,6 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}