Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

standardized strings; deploy only from source repo

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
.github/actions/setup-database.yml vendored
View file

@ -48,8 +48,8 @@ runs:
uses: mirromutth/mysql-action@v1.1 uses: mirromutth/mysql-action@v1.1
with: with:
host port: 3306 host port: 3306
# character set server: 'utf8mb4' # character set server: "utf8mb4"
# collation server: 'utf8mb4_unicode_ci' # collation server: "utf8mb4_unicode_ci"
character set server: "utf8" character set server: "utf8"
collation server: "utf8_general_ci" collation server: "utf8_general_ci"
mysql database: "evennia" mysql database: "evennia"
@ -81,9 +81,9 @@ runs:
# get logs from db start # get logs from db start
- name: Database container logs - name: Database container logs
if: ${{ inputs.database == 'postgresql' || inputs.database == 'mysql' }} if: ${{ inputs.database == "postgresql" || inputs.database == "mysql" }}
uses: jwalton/gh-docker-logs@v2 uses: jwalton/gh-docker-logs@v2
- name: Check running containers - name: Check running containers
if: ${{ inputs.database == 'postgresql' || inputs.database == 'mysql' }} if: ${{ inputs.database == "postgresql" || inputs.database == "mysql" }}
run: docker ps -a run: docker ps -a

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