diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index fc2cd48f..5a94fdc3 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -14,18 +14,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - - name: Cache Static Files - id: static-cache - uses: actions/cache@v2 - with: - path: | - 'static/' - 'pipeline/built_assets' - key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }} - uses: bahmutov/npm-install@v1 - if: steps.static-cache.outputs.cache-hit != 'true' + # if: steps.static-cache.outputs.cache-hit != 'true' - run: node node_modules/gulp/bin/gulp build - if: steps.static-cache.outputs.cache-hit != 'true' + # if: steps.static-cache.outputs.cache-hit != 'true' - name: Set up Python uses: actions/setup-python@v2 with: diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index c40350a1..3ce2723a 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -230,7 +230,7 @@ DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S') # Static files (CSS, JavaScript, Images) STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' STATIC_URL = '/static/' -STATIC_ROOT = BASE_DIR / 'staticfiles' +STATIC_ROOT = BASE_DIR / 'static/' STATICFILES_DIRS = [ BASE_DIR / 'pipeline/built_assets', ] diff --git a/PyRIGS/urls.py b/PyRIGS/urls.py index 00794415..da12b768 100644 --- a/PyRIGS/urls.py +++ b/PyRIGS/urls.py @@ -34,7 +34,7 @@ if settings.DEBUG: urlpatterns += staticfiles_urlpatterns() import debug_toolbar - urlpatterns = [ + urlpatterns += [ path('__debug__/', include(debug_toolbar.urls)), path('bootstrap/', TemplateView.as_view(template_name="bootstrap.html")), - ] + urlpatterns + ]