script

Author: nhsdevws

.github/workflows/sonarcloud.yml

@@ -32,14 +32,22 @@ jobs:
 
       - name: Cache global Poetry virtualenvs
 
+        # uses: actions/cache@v4
+        # with:
+        #   path: ~/.cache/pypoetry/virtualenvs
+        #   key: ${{ runner.os }}-poetry-global-venv-py${{ matrix.python-version || 'all' }}-${{ hashFiles('**/poetry.lock') }}
+        #   restore-keys: |
+        #     ${{ runner.os }}-poetry-global-venv-py${{ matrix.python-version || 'all' }}-
+
         uses: actions/cache@v4
         with:
           path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-poetry-global-venv-py${{ matrix.python-version || 'all' }}-${{ hashFiles('**/poetry.lock') }}
+          key: ${{ runner.os }}-poetry-venv-${{ matrix.python-version }}-${{ hashFiles('<project>/poetry.lock') }}
           restore-keys: |
-            ${{ runner.os }}-poetry-global-venv-py${{ matrix.python-version || 'all' }}-
+            ${{ runner.os }}-poetry-venv-${{ matrix.python-version }}-
+
+
 
-              
       - name: Set up AWS credentials
         env:
           AWS_ACCESS_KEY_ID: "FOOBARKEY"
@@ -85,10 +93,7 @@ jobs:
         id: acklambda
         continue-on-error: true
         run: |
-          poetry env use 3.10
-          poetry install
-          poetry run coverage run -m unittest discover || echo "ack-lambda tests failed" >> ../failed_tests.txt
-          poetry run coverage xml -o ../sonarcloud-coverage-ack-lambda.xml
+          $TEST_SCRIPT 3.10 "ack-lambda" "ack-lambda.xml"
 
       - name: Run unittest with coverage-delta
         if: matrix.python-version == '3.11'
@@ -98,10 +103,7 @@ jobs:
             PYTHONPATH: delta_backend/src:delta_backend/tests
         continue-on-error: true
         run: |
-          poetry env use 3.11
-          poetry install
-          poetry run coverage run -m unittest discover || echo "delta tests failed" >> ../failed_tests.txt
-          poetry run coverage xml -o ../sonarcloud-coverage-delta.xml
+          $RUN_TEST 3.11 delta_backend delta.xml
 
       # - name: Run unittest with coverage-fhir-api
       #   working-directory: backend