Merge pull request #385 from Lightmatter/feature/inner_app_cleanup

Inner App Post-Testing Cleanup
Lightmatter · Feb 10, 2023 · f8afd3c · f8afd3c
2 parents e060a02 + 0c9b20d
commit f8afd3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/{{cookiecutter.repo_name}}/.github/workflows/django_ci.yml b/{{cookiecutter.repo_name}}/.github/workflows/django_ci.yml
@@ -90,30 +90,26 @@ jobs:
         run: npm install
 
       - name: Install and configure Poetry
-        uses: snok/install-poetry@e3dbfd357f4751d4f582d62bc8a71e56c2a7015b # v1.3.2
-        with:
-          version: 1.2.1
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
+        run: |
+          pipx install poetry==1.3.2
+          poetry config virtualenvs.create true
+          poetry config virtualenvs.in-project false
+          poetry config installer.parallel true
 
       - uses: actions/setup-python@v4
         id: setup_python
         with:
           python-version-file: ".python-version"
           cache: "poetry"
 
-      - run: poetry env use ${{ steps.setup_python.outputs.python-version }}
-
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+      - name: Install + build NPM
+        run: |
+          npm ci
+          npm run build
 
       - name: Install dependencies
         run: |
+          poetry env use ${{ steps.setup_python.outputs.python-version }}
           poetry install --no-interaction --no-root
           poetry run playwright install chromium
 

diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/admin/base_site.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/admin/base_site.html
@@ -3,6 +3,7 @@
 {% block extrahead %}
     {{ block.super }}
     {% vite_hmr_client %}
+    {% vite_asset 'js/forms.ts' %}
     {% vite_asset 'js/main.ts' %}
     {% vite_asset 'css/tailwind.js' %}
   <style>