Merge branch 'main' of https://dev.discours.io/discours.io/inbox
This commit is contained in:
commit
595fa945cf
|
@ -18,9 +18,18 @@ jobs:
|
|||
id: branch_name
|
||||
run: echo "::set-output name=branch::$(echo ${GITHUB_REF##*/})"
|
||||
|
||||
- name: Push to dokku
|
||||
- name: Push to dokku for main branch
|
||||
if: github.ref == 'refs/heads/main'
|
||||
uses: dokku/github-action@master
|
||||
with:
|
||||
branch: 'main'
|
||||
git_remote_url: 'ssh://dokku@v2.discours.io:22/inbox'
|
||||
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
|
||||
- name: Push to dokku for staging branch
|
||||
if: github.ref == 'refs/heads/dev'
|
||||
uses: dokku/github-action@master
|
||||
with:
|
||||
branch: 'main'
|
||||
git_remote_url: 'ssh://dokku@staging.discours.io:22/inbox'
|
||||
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
7
main.py
7
main.py
|
@ -4,6 +4,9 @@ from os.path import exists
|
|||
|
||||
from ariadne import load_schema_from_path, make_executable_schema
|
||||
from starlette.applications import Starlette
|
||||
from ariadne.asgi import GraphQL
|
||||
|
||||
from starlette.routing import Route
|
||||
|
||||
from services.rediscache import redis
|
||||
from services.schema import resolvers
|
||||
|
@ -22,7 +25,6 @@ async def start():
|
|||
f.write(str(os.getpid()))
|
||||
print(f"[main] process started in {MODE} mode")
|
||||
|
||||
|
||||
# main starlette app object with ariadne mounted in root
|
||||
app = Starlette(
|
||||
on_startup=[
|
||||
|
@ -32,4 +34,7 @@ app = Starlette(
|
|||
],
|
||||
on_shutdown=[redis.disconnect],
|
||||
debug=True,
|
||||
routes=[
|
||||
Route("/", GraphQL(schema, debug=True)),
|
||||
],
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue
Block a user