From 1274140c39547c5d9392e679caffe22a725fae88 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sat, 30 Jan 2021 03:26:09 +0000 Subject: [PATCH] Helps if I don't delete the pipeline folder prior to collectstatic --- .github/workflows/django.yml | 21 +++++---------------- package.json | 2 +- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index ac31f7bf..17ea4def 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -10,12 +10,12 @@ jobs: build: if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest - strategy: - matrix: - browser: ['chrome'] + # strategy: + # matrix: + # browser: ['chrome'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BROWSER: ${{ matrix.browser }} + # BROWSER: ${{ matrix.browser }} steps: - uses: actions/checkout@v2 - uses: bahmutov/npm-install@v1 @@ -35,24 +35,13 @@ jobs: pip install pycodestyle coverage coveralls django_coverage_plugin pytest-cov pip install --upgrade --upgrade-strategy eager -r requirements.txt python manage.py collectstatic --noinput - - name: Cache gulp output - uses: actions/cache@v2 - with: - path: static/ - key: static-${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }} - name: Basic Checks run: | pycodestyle . --exclude=migrations,node_modules python manage.py check python manage.py makemigrations --check --dry-run - name: Run Tests - uses: paambaati/codeclimate-action@v2.7.5 - env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} - with: - coverageCommand: coverage run -m pytest -n 8 - coverageLocations: | - ${{github.workspace}}/.coverage:coverage.py + run: coverage run -m pytest -n 8 - uses: actions/upload-artifact@v2 if: failure() with: diff --git a/package.json b/package.json index 1589e86d..348b0553 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,6 @@ "scripts": { "gulp": "gulp", "build": "node node_modules/gulp/bin/gulp build", - "heroku-cleanup": "rm -rf node_modules/ pipeline/ gulpfile.js" + "heroku-cleanup": "rm -rf node_modules/ pipeline/source_assets gulpfile.js" } }