From a61276bdab253d34aeb7fa62c9a3ce4f660e6d36 Mon Sep 17 00:00:00 2001 From: Conrado Silva Miranda Date: Thu, 21 Nov 2024 09:39:26 -0800 Subject: [PATCH 1/5] Manually cache pdm --- .github/workflows/pr_build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 00f9b2671..a43687668 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -62,8 +62,15 @@ jobs: uses: pdm-project/setup-pdm@v3 with: python-version: '3.10' - cache: true - cache-dependency-path: 'llm-service/pdm.lock' + python-version-file: './llm-service/pyproject.toml' + cache: false + # cache-dependency-path: './llm-service/pdm.lock' + + - name: Cache pdm cache folder + uses: actions/cache@v4 + with: + path: /home/runner/.cache/pdm + key: pdm-${{ hashFiles('./llm-service/pdm.lock') }} - name: Install Python dependencies run: | From a2ff5024cdc47f926b6ef591be0cc55781e204c9 Mon Sep 17 00:00:00 2001 From: Conrado Silva Miranda Date: Thu, 21 Nov 2024 09:43:40 -0800 Subject: [PATCH 2/5] cleanup --- .github/workflows/pr_build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index a43687668..568618bb2 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -62,9 +62,7 @@ jobs: uses: pdm-project/setup-pdm@v3 with: python-version: '3.10' - python-version-file: './llm-service/pyproject.toml' cache: false - # cache-dependency-path: './llm-service/pdm.lock' - name: Cache pdm cache folder uses: actions/cache@v4 From c9b07867adec5dea67644d63da07390fa7033d81 Mon Sep 17 00:00:00 2001 From: Conrado Silva Miranda Date: Thu, 21 Nov 2024 09:47:42 -0800 Subject: [PATCH 3/5] save the venv --- .github/workflows/pr_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 568618bb2..77786d302 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -67,8 +67,8 @@ jobs: - name: Cache pdm cache folder uses: actions/cache@v4 with: - path: /home/runner/.cache/pdm - key: pdm-${{ hashFiles('./llm-service/pdm.lock') }} + path: ./llm-service/.venv + key: pdm-venv-${{ hashFiles('./llm-service/pdm.lock') }} - name: Install Python dependencies run: | From cd2d679f497703b022066560f8c8e8bd3ea90a15 Mon Sep 17 00:00:00 2001 From: Conrado Silva Miranda Date: Thu, 21 Nov 2024 09:53:35 -0800 Subject: [PATCH 4/5] skip install --- .github/workflows/pr_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 77786d302..259fb0f4f 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -66,11 +66,13 @@ jobs: - name: Cache pdm cache folder uses: actions/cache@v4 + id: python_cache with: - path: ./llm-service/.venv + # path: ./llm-service/.venv key: pdm-venv-${{ hashFiles('./llm-service/pdm.lock') }} - name: Install Python dependencies + if: steps.python_cache.outputs.cache-hit != 'true' run: | pdm install working-directory: llm-service From 30f5dd40b686391e4b7428c3e6f60e6a805fefa3 Mon Sep 17 00:00:00 2001 From: Conrado Silva Miranda Date: Thu, 21 Nov 2024 09:56:10 -0800 Subject: [PATCH 5/5] re-add path --- .github/workflows/pr_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 259fb0f4f..26c82fa5f 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -68,7 +68,7 @@ jobs: uses: actions/cache@v4 id: python_cache with: - # path: ./llm-service/.venv + path: ./llm-service/.venv key: pdm-venv-${{ hashFiles('./llm-service/pdm.lock') }} - name: Install Python dependencies