Merge pull request #3008 from dvoraen/workflow_fix

Workflow string fixes for GitHub

.github/actions/setup-database.yml

@@ -21,7 +21,7 @@ runs:
 
   steps:
     - name: Set up PostgreSQL server
-      if: ${{ inputs.database == "postgresql" }}
+      if: ${{ inputs.database == 'postgresql' }}
       uses: harmon758/postgresql-action@v1
       with:
         postgresql version: "11"
@@ -30,7 +30,7 @@ runs:
         postgresql password: "password"
 
     - name: Wait for PostgreSQL to activate
-      if: ${{ inputs.database == "postgresql" }}
+      if: ${{ inputs.database == 'postgresql' }}
       run: |
         while ! pg_isready -h 127.0.0.1 -q >/dev/null 2>&1
         do
@@ -41,7 +41,7 @@ runs:
       shell: bash
 
     - name: Set up MySQL server
-      if: ${{ inputs.database == "mysql" }}
+      if: ${{ inputs.database == 'mysql' }}
       uses: mirromutth/mysql-action@v1.1
       with:
         host port: 3306
@@ -55,7 +55,7 @@ runs:
         mysql root password: root_password
 
     - name: Wait for MySQL to activate
-      if: ${{ inputs.database == "mysql" }}
+      if: ${{ inputs.database == 'mysql' }}
       run: |
         while ! mysqladmin ping -h 127.0.0.1 -u root -proot_password -s >/dev/null 2>&1
         do
@@ -66,7 +66,7 @@ runs:
       shell: bash
 
     - name: Set up MySQL Privileges
-      if: ${{ inputs.database == "mysql" }}
+      if: ${{ inputs.database == 'mysql' }}
       run: |
         cat <<EOF | mysql -u root -proot_password -h 127.0.0.1 mysql
           create user 'evennia'@'%' identified by 'password';
@@ -78,9 +78,9 @@ runs:
 
     # get logs from db start
     - name: Database container logs
-      if: ${{ inputs.database == "postgresql" || inputs.database == "mysql" }}
+      if: ${{ inputs.database == 'postgresql' || inputs.database == 'mysql' }}
       uses: jwalton/gh-docker-logs@v2
 
     - name: Check running containers
-      if: ${{ inputs.database == "postgresql" || inputs.database == "mysql" }}
+      if: ${{ inputs.database == 'postgresql' || inputs.database == 'mysql' }}
       run: docker ps -a

.github/workflows/github_action_test_suite.yml

@@ -95,7 +95,7 @@ jobs:
       # it's also not critical if pushing to either service fails (happens for PRs since env is not
       # available outside of the evennia org)
       - name: Send data to Coveralls
-        if: ${{ matrix.coverage-test && (github.ref == "refs/heads/master" || github.ref == "refs/heads/develop") }}
+        if: ${{ matrix.coverage-test && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') }}
         continue-on-error: true
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
@@ -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' }}
     steps:
       - uses: actions/checkout@v3
 
@@ -118,14 +118,14 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        if: ${{ github.ref == "refs/heads/master" || github.ref == "refs/heads/develop" }}
+        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push for master
-        if: ${{ github.ref == "refs/heads/master" }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         id: docker_build_master
         uses: docker/build-push-action@v3
         with:
@@ -133,7 +133,7 @@ jobs:
           tags: evennia/evennia:latest
 
       - name: Build and push for develop
-        if: ${{ github.ref == "refs/heads/develop" }}
+        if: ${{ github.ref == 'refs/heads/develop' }}
         id: docker_build_develop
         uses: docker/build-push-action@v3
         with: