Compare commits

...

5 Commits

Author SHA1 Message Date
Jeff Kaufman f867347b5a update mps 2016-12-19 10:47:46 -05:00
Jeff Kaufman 5bd8c93d39 ngx_pagespeed depends on luuid 2016-12-16 15:35:25 -05:00
Jeff Kaufman d85b22afe6 update mps 2016-12-16 14:42:26 -05:00
Jeff Kaufman 0456450fd2 update mps 2016-12-16 13:39:16 -05:00
Jeff Kaufman 90386f459a travis: get it building and passing tests
I initially planned to get this working on Ubuntu 12, but decided it wasn't
worth it and switched to Ubuntu 14 (Trusty).  Now it passes tests on Travis, so
I've added other people's emails back to the set of people to send emails to.

Also update mps while we're at it.
2016-12-16 12:40:54 -05:00
3 changed files with 10 additions and 2 deletions
+8
View File
@@ -9,6 +9,9 @@ env:
# jobs=8: 179s (29s to install new git, 150s to run the downloads) # jobs=8: 179s (29s to install new git, 150s to run the downloads)
# We can't use --depth=1, though, because github doesn't have # We can't use --depth=1, though, because github doesn't have
# allowReachableSHA1InWant set. # allowReachableSHA1InWant set.
#
# TODO(jefftk): once we're running on a server with git 2.8 or later we can have
# --jobs without installing a new git.
git: git:
submodules: false submodules: false
before_install: before_install:
@@ -21,9 +24,14 @@ install:
script: script:
test/run_tests.sh $PWD/testing-dependencies/mod_pagespeed/ \ test/run_tests.sh $PWD/testing-dependencies/mod_pagespeed/ \
$PWD/nginx/sbin/nginx $PWD/nginx/sbin/nginx
dist: trusty
sudo: required sudo: required
compiler: compiler:
- gcc - gcc
notifications: notifications:
email: email:
- cheesy@google.com
- jefftk@google.com - jefftk@google.com
- morlovich@google.com
- jmarantz@google.com
- huibao@google.com
+1 -1
View File
@@ -198,7 +198,7 @@ pagespeed_include="\
$mod_pagespeed_dir/url" $mod_pagespeed_dir/url"
ngx_feature_path="$pagespeed_include" ngx_feature_path="$pagespeed_include"
pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm" pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm -luuid"
ngx_feature_libs="$pagespeed_libs" ngx_feature_libs="$pagespeed_libs"
ngx_feature_test=" ngx_feature_test="