From 89a9350594e55c833fe58ab6cb26bb2abb946724 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 13 Dec 2024 12:33:28 +0100 Subject: [PATCH] fix template injection --- .github/workflows/qc_checks.yaml | 10 +++++----- .github/workflows/release.yaml | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml index a786ff5a47e5..84cd38e4e4cb 100644 --- a/.github/workflows/qc_checks.yaml +++ b/.github/workflows/qc_checks.yaml @@ -246,7 +246,7 @@ jobs: if: needs.paths-filter.outputs.server == 'true' || needs.paths-filter.outputs.force == 'true' env: - wrapper_name: inventree-python + WRAPPER_NAME: inventree-python INVENTREE_DB_ENGINE: django.db.backends.sqlite3 INVENTREE_DB_NAME: ../inventree_unit_test_db.sqlite3 INVENTREE_ADMIN_USER: testuser @@ -265,17 +265,17 @@ jobs: dev-install: true update: true npm: true - - name: Download Python Code For `${{ env.wrapper_name }}` - run: git clone --depth 1 https://github.com/inventree/${{ env.wrapper_name }} ./${{ env.wrapper_name }} + - name: Download Python Code For `${WRAPPER_NAME}` + run: git clone --depth 1 https://github.com/inventree/${WRAPPER_NAME} ./${WRAPPER_NAME} - name: Start InvenTree Server run: | invoke dev.delete-data -f invoke dev.import-fixtures invoke dev.server -a 127.0.0.1:12345 & invoke wait - - name: Run Tests For `${{ env.wrapper_name }}` + - name: Run Tests For `${WRAPPER_NAME}` run: | - cd ${{ env.wrapper_name }} + cd ${WRAPPER_NAME} invoke check-server coverage run -m unittest discover -s test/ diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f62f51fd5805..8ec5a70c9f28 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -57,7 +57,9 @@ jobs: - name: Write version file - SHA run: cd src/backend/InvenTree/web/static/web/.vite && echo "$GITHUB_SHA" > sha.txt - name: Write version file - TAG - run: cd src/backend/InvenTree/web/static/web/.vite && echo "${{ github.ref_name }}" > tag.txt + run: cd src/backend/InvenTree/web/static/web/.vite && echo "${REF_NAME}" > tag.txt + env: + REF_NAME: ${{ github.ref_name }} - name: Zip frontend run: | cd src/backend/InvenTree/web/static/web