From 0fe933debb0a02260d453b7454ad1676ce76d195 Mon Sep 17 00:00:00 2001 From: Philip Belesky Date: Thu, 18 Jan 2018 15:28:00 +1100 Subject: [PATCH] Fix regression in appveyor/heroku deploys --- Dockerfile | 3 ++- README.md | 2 +- appveyor.yml | 5 +++-- bin/post_compile | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 52ce170d5d7..00b37127439 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,6 @@ RUN npm install # Compile all the static files RUN npm rebuild node-sass -RUN npm run gulp build +RUN npm -g install gulp-cli # Needed for the gulp command to then work +RUN gulp build RUN python ./tabbycat/manage.py collectstatic --no-input diff --git a/README.md b/README.md index ddfe431457f..e535d9cfca6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![Docs](https://readthedocs.org/projects/tabbycat/badge/)](http://tabbycat.readthedocs.io/en/stable/) [![Build Status](https://travis-ci.org/TabbycatDebate/tabbycat.svg?branch=develop)](https://travis-ci.org/TabbycatDebate/tabbycat) [![Build status](https://ci.appveyor.com/api/projects/status/hcht4g5x2m5urr8y/branch/develop?svg=true)](https://ci.appveyor.com/project/philipbelesky/tabbycat-81705/branch/develop) -[![Dependency Status](https://gemnasium.com/badges/github.com/TabbycatDebate/tabbycat.svg)](https://gemnasium.com/github.com/TabbycatDebate/tabbycat) +[![Dependenc Status](https://gemnasium.com/badges/github.com/TabbycatDebate/tabbycat.svg)](https://gemnasium.com/github.com/TabbycatDebate/tabbycat) [![Maintainability](https://api.codeclimate.com/v1/badges/33dc219dfb957ad658c2/maintainability)](https://codeclimate.com/github/TabbycatDebate/tabbycat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/33dc219dfb957ad658c2/test_coverage)](https://codeclimate.com/github/TabbycatDebate/tabbycat/test_coverage) diff --git a/appveyor.yml b/appveyor.yml index 5489daa35ed..a169b7ca710 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,6 +61,7 @@ install: - python -m pip install -U pip - pip install -r requirements_common.txt - npm install + - npm -g install gulp-cli # Needs to be available to then use 'gulp' command later # before_test: # - psql -c "CREATE USER test WITH PASSWORD 'test';" -U postgres @@ -69,8 +70,8 @@ test_script: - cd c:\projects\tabbycat - copy tabbycat\local_settings.example tabbycat\local_settings.py # Need to use local build opt # Update local connection settings - # Test gulp building - - npm run gulp build + # Test gulp building + - gulp build - python tabbycat/manage.py collectstatic # Test Docker Building # This fails at apt-get; apparently something to do with diff --git a/bin/post_compile b/bin/post_compile index be9b74a7190..997d5b120f3 100755 --- a/bin/post_compile +++ b/bin/post_compile @@ -14,7 +14,7 @@ echo "-----> Running dynamic preferences checks" python manage.py checkpreferences echo "-----> Running gulp compilation" -npm run gulp build +gulp build echo "-----> Running whitenoise static files compilation" python manage.py collectstatic --noinput