From 5bac4748aba616707478bab878518d0efb1d6aee Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 22:50:11 +0530 Subject: [PATCH 1/7] feat: cache poetry on gh-actions --- .github/workflows/backend.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index bd522d48..7fc3d1d7 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -21,21 +21,11 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Setup python - uses: actions/setup-python@v5 + - name: Setup Python, Poetry and Dependencies + uses: packetcoders/action-setup-cache-python-poetry@main with: - python-version: '3.12' - - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - virtualenvs-path: .venv - installer-parallel: true - - - name: Install dependencies - run: poetry install --no-interaction + python-version: 3.12 + poetry-version: 1.8.4 - name: Run isort and flake8 run: poetry run poe lint From d6459f283f438e87a5270ed59eff94011525a0c2 Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 22:51:35 +0530 Subject: [PATCH 2/7] test --- backend/manage.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/manage.py b/backend/manage.py index f2a662cf..3f4f51d0 100755 --- a/backend/manage.py +++ b/backend/manage.py @@ -3,6 +3,8 @@ import os import sys +import shortuuid + def main(): """Run administrative tasks.""" From f52ca0941994196a5b83af8b42e3b79a3d5bb018 Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 22:56:26 +0530 Subject: [PATCH 3/7] test: change install dir --- .github/workflows/backend.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 7fc3d1d7..37efd6ce 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -26,6 +26,7 @@ jobs: with: python-version: 3.12 poetry-version: 1.8.4 + install-args: --directory=backend - name: Run isort and flake8 run: poetry run poe lint From 6ff982d5dd8c519430a2fdf1b0b2ee0b7e35b1a4 Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 22:58:05 +0530 Subject: [PATCH 4/7] test: cache --- .github/workflows/backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 37efd6ce..9330be36 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -26,7 +26,7 @@ jobs: with: python-version: 3.12 poetry-version: 1.8.4 - install-args: --directory=backend + install-args: --directory=./backend - name: Run isort and flake8 run: poetry run poe lint From dbb431b0c04db6586f3ae808547c9743e268a050 Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 23:00:26 +0530 Subject: [PATCH 5/7] test: another cache --- backend/manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/manage.py b/backend/manage.py index 3f4f51d0..2c42ed79 100755 --- a/backend/manage.py +++ b/backend/manage.py @@ -3,7 +3,7 @@ import os import sys -import shortuuid +from shortuuid.django_fields import ShortUUID def main(): From 078725e6a69b8883a50e0c87344af4fdbba78c02 Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 23:06:03 +0530 Subject: [PATCH 6/7] revert: old steps with cache action --- .github/workflows/backend.yml | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 9330be36..88c1d1f9 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -21,12 +21,31 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Setup Python, Poetry and Dependencies - uses: packetcoders/action-setup-cache-python-poetry@main + - name: Setup python + uses: actions/setup-python@v5 with: - python-version: 3.12 - poetry-version: 1.8.4 - install-args: --directory=./backend + python-version: '3.12' + + - name: Cache Poetry dependencies + uses: actions/cache@v3 + with: + path: | + backend/.venv + backend/.poetry-cache + key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} + restore-keys: | + ${{ runner.os }}-poetry- + + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + virtualenvs-create: true + virtualenvs-in-project: true + virtualenvs-path: .venv + installer-parallel: true + + - name: Install dependencies + run: poetry install --no-interaction - name: Run isort and flake8 run: poetry run poe lint From 37be6af9aa059be7c10f63e2e5d6d85f1d8b0d8b Mon Sep 17 00:00:00 2001 From: moonlitgrace Date: Wed, 4 Dec 2024 23:08:10 +0530 Subject: [PATCH 7/7] test: cache --- backend/manage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/manage.py b/backend/manage.py index 2c42ed79..30a98a0f 100755 --- a/backend/manage.py +++ b/backend/manage.py @@ -3,7 +3,9 @@ import os import sys -from shortuuid.django_fields import ShortUUID +from shortuuid import get_alphabet + +print(get_alphabet()) def main():