Commit 9b1dfd3e authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'use-caching' into 'master'

Use caching

This enables to use built-in caching feature instead of using the `/cache` folder.

See merge request !2747
parents 4eaa6a4c c9371eab
...@@ -5,6 +5,11 @@ services: ...@@ -5,6 +5,11 @@ services:
- postgres:latest - postgres:latest
- redis:latest - redis:latest
cache:
key: "ruby22"
paths:
- vendor
variables: variables:
MYSQL_ALLOW_EMPTY_PASSWORD: "1" MYSQL_ALLOW_EMPTY_PASSWORD: "1"
...@@ -144,6 +149,10 @@ spec:feature:ruby21: ...@@ -144,6 +149,10 @@ spec:feature:ruby21:
script: script:
- RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -154,6 +163,10 @@ spec:api:ruby21: ...@@ -154,6 +163,10 @@ spec:api:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -164,6 +177,10 @@ spec:models:ruby21: ...@@ -164,6 +177,10 @@ spec:models:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -174,6 +191,10 @@ spec:lib:ruby21: ...@@ -174,6 +191,10 @@ spec:lib:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -184,6 +205,10 @@ spec:services:ruby21: ...@@ -184,6 +205,10 @@ spec:services:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -194,6 +219,10 @@ spec:benchmark:ruby21: ...@@ -194,6 +219,10 @@ spec:benchmark:ruby21:
- master - master
script: script:
- RAILS_ENV=test bundle exec rake spec:benchmark - RAILS_ENV=test bundle exec rake spec:benchmark
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -205,6 +234,10 @@ spec:other:ruby21: ...@@ -205,6 +234,10 @@ spec:other:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -215,6 +248,10 @@ spinach:project:half:ruby21: ...@@ -215,6 +248,10 @@ spinach:project:half:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -225,6 +262,10 @@ spinach:project:rest:ruby21: ...@@ -225,6 +262,10 @@ spinach:project:rest:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
...@@ -235,6 +276,11 @@ spinach:other:ruby21: ...@@ -235,6 +276,11 @@ spinach:other:ruby21:
- master - master
script: script:
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
cache:
key: "ruby21"
paths:
- vendor
tags: tags:
- ruby - ruby
- mysql - mysql
#!/bin/bash #!/bin/bash
if [ -f /.dockerinit ]; then if [ -f /.dockerinit ]; then
# Docker runners use `/cache` folder which is persisted every build mkdir -p vendor
if [ ! -e /cache/phantomjs_1.9.8-0jessie_amd64.deb ]; then if [ ! -e vendor/phantomjs_1.9.8-0jessie_amd64.deb ]; then
wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
mv phantomjs_1.9.8-0jessie_amd64.deb /cache mv phantomjs_1.9.8-0jessie_amd64.deb vendor/
fi fi
dpkg -i /cache/phantomjs_1.9.8-0jessie_amd64.deb dpkg -i vendor/phantomjs_1.9.8-0jessie_amd64.deb
apt-get update -qq apt-get update -qq
apt-get -o dir::cache::archives="/cache/apt" install -y -qq --force-yes \ apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip
cp config/database.yml.mysql config/database.yml cp config/database.yml.mysql config/database.yml
...@@ -20,7 +20,7 @@ if [ -f /.dockerinit ]; then ...@@ -20,7 +20,7 @@ if [ -f /.dockerinit ]; then
cp config/resque.yml.example config/resque.yml cp config/resque.yml.example config/resque.yml
sed -i 's/localhost/redis/g' config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml
export FLAGS=(--path /cache) export FLAGS=(--path vendor)
else else
export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
cp config/database.yml.mysql config/database.yml cp config/database.yml.mysql config/database.yml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment