From 9446722fd50b88d3578bc9f172f2abeac3b2a447 Mon Sep 17 00:00:00 2001
From: Privat33r-dev <the.privat33r+gh@pm.me>
Date: Tue, 30 Apr 2024 01:35:47 +0200
Subject: [PATCH] CD: add caching, move py and node versions to env

`npm ci` instead of `npm install` is more suitable for CI
many minor changes required for caching
---
 .github/workflows/cd.yml    |  6 ++++
 .github/workflows/tests.yml | 62 ++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 6ded4e2..e551bcd 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,5 +1,8 @@
 name: cd
 
+env:
+  PYTHON_VERSION: "3.10"
+
 on:
   push:
     tags:
@@ -28,6 +31,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          cache: 'poetry'
 
       - name: Install dependencies
         run: pip install poetry
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 35fb17f..7b761ab 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,59 +16,59 @@ on:
     branches:
       - main
 
-permissions:
-  contents: read
-
 env:
+  PYTHON_VERSION: "3.10"
+  NODE_VERSION: "20"
   MODULE_NAME: clairvoyance
   MIN_TEST_COV: 0
   SERVER: http://localhost:4000
 
+permissions:
+  contents: read
+
 jobs:
   unit-tests:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
+    - name: Install and configure poetry
+      run: |
+        pipx install poetry
+        poetry config virtualenvs.in-project true
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        pip install poetry
+        python-version: ${{ env.PYTHON_VERSION }}
+        cache: 'poetry'
     - name: Setup poetry
-      run: |
-        poetry config virtualenvs.in-project true
-        poetry install
+      run: poetry install
     - name: Run tests
       run: |
         source .venv/bin/activate
         pytest --cov=$MODULE_NAME --cov-report=xml --cov-fail-under=$MIN_TEST_COV tests
 
   system-tests:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
+    - name: Install and configure poetry
+      run: |
+        pipx install poetry
+        poetry config virtualenvs.in-project true
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        pip install poetry
+        python-version: ${{ env.PYTHON_VERSION }}
+        cache: 'poetry'
     - name: Setup poetry
-      run: |
-        poetry config virtualenvs.in-project true
-        poetry install
+      run: poetry install
     - uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: ${{ env.NODE_VERSION }}
+        cache: 'npm'
+        cache-dependency-path: tests/apollo-server/
     - name: Install deps and run server
       run: |
-        cd tests/apollo-server
-        npm install
+        cd tests/apollo-server/
+        npm ci
         node src/index.js &
     - name: Wait for server
       run: |
@@ -96,16 +96,16 @@ jobs:
     if: false
     steps:
     - uses: actions/checkout@v4
+    - name: Install and configure poetry
+      run: |
+        pipx install poetry
+        poetry config virtualenvs.in-project true
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        pip install poetry
+        python-version: ${{ env.PYTHON_VERSION }}
+        cache: 'poetry'
     - name: Setup poetry
-      run: |
-        poetry config virtualenvs.in-project true
-        poetry install
+      run: poetry install
     - name: Run lint
       if: always()
       run: |