standardized strings; deploy only from source repo

This commit is contained in:
dvoraen 2022-12-01 06:58:17 -08:00
parent 868b3bdaeb
commit c3bea4aaec
2 changed files with 9 additions and 8 deletions

View file

@ -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

View file

@ -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: