Skip to content

Commit

Permalink
Fix regression in appveyor/heroku deploys
Browse files Browse the repository at this point in the history
  • Loading branch information
philipbelesky committed Jan 18, 2018
1 parent 3087a39 commit 0fe933d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/post_compile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0fe933d

Please sign in to comment.