From c3bea4aaec36726d01ccae9891df7d892793bf39 Mon Sep 17 00:00:00 2001
From: dvoraen <42825596+dvoraen@users.noreply.github.com>
Date: Thu, 1 Dec 2022 06:58:17 -0800
Subject: [PATCH] standardized strings; deploy only from source repo

---
 .github/actions/setup-database.yml             | 8 ++++----
 .github/workflows/github_action_test_suite.yml | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/actions/setup-database.yml b/.github/actions/setup-database.yml
index 2d98344961..cb33aef0d5 100644
--- a/.github/actions/setup-database.yml
+++ b/.github/actions/setup-database.yml
@@ -48,8 +48,8 @@ runs:
       uses: mirromutth/mysql-action@v1.1
       with:
         host port: 3306
-        # character set server: 'utf8mb4'
-        # collation server: 'utf8mb4_unicode_ci'
+        # character set server: "utf8mb4"
+        # collation server: "utf8mb4_unicode_ci"
         character set server: "utf8"
         collation server: "utf8_general_ci"
         mysql database: "evennia"
@@ -81,9 +81,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
diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml
index b1343e8d2b..78154b302d 100644
--- a/.github/workflows/github_action_test_suite.yml
+++ b/.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,6 +107,7 @@ jobs:
     name: Deploy Docker Image
     needs: test
     runs-on: ubuntu-latest
+    if: ${{ github.repository == "evennia/evennia" }}
     steps:
       - uses: actions/checkout@v3
 
@@ -117,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:
@@ -132,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: