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

Merge pull request #3010 from dvoraen/action_fix

Browse source 
Action fix
This commit is contained in:
Griatch 2022-12-02 00:21:08 +01:00 • committed by GitHub
commit 829ea2faa3
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/actions/setup-database.yml → .github/actions/setup-database/action.yml vendored
View file

@ -13,7 +13,6 @@ description: "Activates the database server for the passed in service and ensure
inputs: inputs:
database: database:
description: "Database service being initialized." description: "Database service being initialized."
type: string
required: true required: true
runs: runs:
@ -84,3 +83,4 @@ runs:
- 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
shell: bash

3
.github/workflows/github_action_test_suite.yml vendored
View file

@ -107,7 +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' }} if: ${{ github.repository == 'evennia/evennia' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop') }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -118,7 +118,6 @@ 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' }}
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}