Commit graph

12 commits

Author SHA1 Message Date
James Lopez
c9be4d65f2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci
# Conflicts:
#	.gitlab-ci.yml
2016-02-18 11:12:26 +01:00
Kamil Trzcinski
c9371eab13 Use caching, instead of haxxy /cache 2016-02-10 16:53:55 +01:00
James Lopez
0309e0818a removed slack task and added bash script instead. Updated gitlab-ci config file 2016-02-05 11:04:13 +01:00
Kamil Trzcinski
25bde645d8 Install unzip in build environment [ci skip] 2016-01-25 10:59:01 +01:00
Kamil Trzcinski
2c28c11df5 Forcefully install apt packages 2016-01-23 21:29:43 +01:00
Kamil Trzcinski
edf93ecb6e Speed-up docker based builds
Enable to:
- Use APT cache
- Use Bundler cache
- Use PhantomJS cache
2016-01-22 19:09:22 +01:00
Achilleas Pipinellis
bb6ce2bb10 Test using a 1.9.8 phantomjs version built with fpm
https://gitlab.com/axil/phantomjs-debian
2015-11-29 13:44:19 +02:00
Achilleas Pipinellis
7d6323a9d4 Update phantomjs to 2.0.0
* Version 1.9 was removed from upstream Debian repos
2015-11-29 11:51:02 +02:00
Douwe Maan
046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Kamil Trzcinski
213d5fb773 Added missing packages required by docker builds 2015-06-25 15:42:56 +02:00
Marin Jankovski
82b21a835c Set build preparation script as executable. 2015-06-19 09:17:47 +02:00
Marin Jankovski
2b49706f1f Move prepare_build script to scripts dir. 2015-06-18 10:46:24 +02:00