From 3ddf93088aefda0622752b023a3961e1e6cfb961 Mon Sep 17 00:00:00 2001 From: Destiny Saturday Date: Thu, 15 Aug 2024 20:01:52 +0000 Subject: [PATCH 1/3] chore: updated gitignore --- .gitignore | 7 +++---- t | 8 -------- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 t diff --git a/.gitignore b/.gitignore index 92937b637..1bdf3ebf0 100644 --- a/.gitignore +++ b/.gitignore @@ -124,12 +124,13 @@ celerybeat.pid *.sage.py # Environments -.env +.env* +!.env.sample .venv .blog_env/ env/ -venv/ +venv* *venv/ ENV/ env.bak/ @@ -167,5 +168,3 @@ cython_debug/ # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ - -test_case1.py diff --git a/t b/t deleted file mode 100644 index 46ba6e06f..000000000 --- a/t +++ /dev/null @@ -1,8 +0,0 @@ - bugfix/billing_test - dev - feat/accept_invite - feat/expose_test_cases - feat/mail_service - feat/request_password_reset - feat/roles_permissions -* feat/stripe_checkout From 78c3b4f6993e6dec06acb98ffc7507a16d5377ff Mon Sep 17 00:00:00 2001 From: Destiny Saturday Date: Thu, 15 Aug 2024 21:06:15 +0100 Subject: [PATCH 2/3] Update cd.dev.yaml Signed-off-by: Destiny Saturday --- .github/workflows/cd.dev.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.dev.yaml b/.github/workflows/cd.dev.yaml index 2ebf6cc75..ba057dd88 100644 --- a/.github/workflows/cd.dev.yaml +++ b/.github/workflows/cd.dev.yaml @@ -1,4 +1,4 @@ -name: Dev Branch Deployment +name: Dev Deployment on: push: @@ -22,9 +22,12 @@ jobs: username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} script: | - cd boilerplate-python/dev/ + cd hng_boilerplate_python_fastapi_web + git add . + git stash + git checkout dev git pull origin dev - source .venv/bin/activate + source venv-dev/bin/activate pip install -r requirements.txt alembic upgrade head - + echo "${{ secrets.PASSWORD }}" | sudo -S systemctl restart python-bp-dev.service From a98d339b3718109604dc3c6e0ac7fd018ecc8a41 Mon Sep 17 00:00:00 2001 From: Destiny Saturday Date: Thu, 15 Aug 2024 21:19:28 +0100 Subject: [PATCH 3/3] Update cd.dev.yaml Signed-off-by: Destiny Saturday --- .github/workflows/cd.dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.dev.yaml b/.github/workflows/cd.dev.yaml index ba057dd88..548623358 100644 --- a/.github/workflows/cd.dev.yaml +++ b/.github/workflows/cd.dev.yaml @@ -23,10 +23,10 @@ jobs: password: ${{ secrets.PASSWORD }} script: | cd hng_boilerplate_python_fastapi_web - git add . - git stash - git checkout dev - git pull origin dev + # git add . + # git stash + # git checkout dev + # git pull origin dev source venv-dev/bin/activate pip install -r requirements.txt alembic upgrade head