v.8.0.3

5 files changed, 22 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3a72f9c43c6..8bba1f73b18c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = gitlab-ci
 	pkgdesc = Continuous integration server for gitlabhq | Coordinator
-	pkgver = 7.14.3
+	pkgver = 8.0.3
 	pkgrel = 1
 	url = http://www.gitlab.com/gitlab-ci
 	install = gitlab-ci.install
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = ruby>=2.0
-	depends = ruby-bundler>=1.5.2
+	depends = ruby2.1
+	depends = ruby2.1-bundler>=1.5.2
 	depends = openssh
 	depends = redis
 	depends = libxslt
@@ -22,7 +22,7 @@ pkgbase = gitlab-ci
 	backup = etc/webapps/gitlab-ci/resque.yml
 	backup = etc/webapps/gitlab-ci/unicorn.rb
 	backup = etc/logrotate.d/gitlab-ci
-	source = gitlab-ci-7.14.3.tar.gz::https://github.com/gitlabhq/gitlab-ci/archive/v7.14.3.tar.gz
+	source = gitlab-ci-8.0.3.tar.gz::https://github.com/gitlabhq/gitlab-ci/archive/v8.0.3.tar.gz
 	source = gitlab-ci.target
 	source = gitlab-ci-unicorn.service
 	source = gitlab-ci-sidekiq.service
@@ -34,10 +34,10 @@ pkgbase = gitlab-ci
 	source = apache-ssl.conf.example
 	source = nginx-ssl.conf.example
 	source = lighttpd.conf.example
-	sha512sums = 74c96c36d892f88f204466e99020dcf1438605bf85714484cdac442b04e6590cd79af2e97c1f738a2c2d32f81e1007d5563e6a32f2f165c6f42e76f4f53da479
+	sha512sums = c0fcaae82a36cd0f8b07c01ecd4bc2a7d1b0d736e34015b39260c56293465b356997f419d2c9c2636c8930898486da0036aadeb156d54232ead945fae2051754
 	sha512sums = 30cf8ad2a26f0f6d87cb230c69668f8d7b15329af21985349bbc2c8eb3560ccbc82dd173e65be41aa71246b2426fc123f43d45b103371ce47a56d9ba7bda46bc
-	sha512sums = 3f202f6c21f380f8fd98b34bc7e6d48a94dcb5339e67e71284ef9589b0381dba73ecccdb4f0c3cefd5786e5326e8220c6650ed350c2ba6ea214be9b1232bf253
-	sha512sums = b1585c29e3b17f3ba9ad237a1a612749bbc9bc25ed06f0c5862213440b0608ed34b8fdf8e0dbf0b198dc16593120edf9a467c218bb9aac8ab51cfd2867215873
+	sha512sums = ea24c7fe19789c82dde144713076c185c258afb103ec35dd3a68320dee8dfc4cb1e9fe0f1045af17798eb8ad9115a4d710d4f6c825d2530a2f60e9f721b7ec40
+	sha512sums = 1dd9bf5d4d30831397b25e2b6af37167653146aa2dcda489dd66c1d23dac45009f02a520dbcd608cc6b730032ef669d0deb78f20c2f7986567bc5c01a4b5f345
 	sha512sums = 83642ba8433e1e59ecd2f603098ccebe45a0109bddf1b060a9d95fd958c02f99f86beaf5f26d3c6acadd830f9a579bb2312af534658998fc5a4c56c78244e67d
 	sha512sums = cdc948304eed5cfc62de2a953295129a9d9d61ee0be6165397bca6678108052e314d4c0ed4b7211df5a65ebdc39b4738900e7f71b58146b1b3b120bf1cdd4271
 	sha512sums = 1323dc3bae4f4c9d4a42062abc83f4330014519df78a00a263ac20f9cc489af4d781f1b32a77756ed96b53c44de2bd2bd19c36c193b04f01f40be8c2f5369f7a
diff --git a/PKGBUILD b/PKGBUILD
index 2df46f83c2a2..63a109bc01c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Pavol (Lopo) Hluchy <lopo AT losys DOT eu>
 
 pkgname=gitlab-ci
-pkgver=7.14.3
+pkgver=8.0.3
 pkgrel=1
 pkgdesc="Continuous integration server for gitlabhq | Coordinator"
 arch=('i686' 'x86_64')
 url="http://www.gitlab.com/gitlab-ci"
 license=('MIT')
-depends=('ruby>=2.0' 'ruby-bundler>=1.5.2' 'openssh' 'redis' 'libxslt' 'icu' 'nodejs')
+depends=('ruby2.1' 'ruby2.1-bundler>=1.5.2' 'openssh' 'redis' 'libxslt' 'icu' 'nodejs')
 optdepends=(
 	'mariadb: database backend'
 	'postgresql: database backend'
@@ -33,10 +33,10 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/gitlabhq/gitlab-ci/archive/
 	lighttpd.conf.example
 	)
 install='gitlab-ci.install'
-sha512sums=('74c96c36d892f88f204466e99020dcf1438605bf85714484cdac442b04e6590cd79af2e97c1f738a2c2d32f81e1007d5563e6a32f2f165c6f42e76f4f53da479'
+sha512sums=('c0fcaae82a36cd0f8b07c01ecd4bc2a7d1b0d736e34015b39260c56293465b356997f419d2c9c2636c8930898486da0036aadeb156d54232ead945fae2051754'
 	'30cf8ad2a26f0f6d87cb230c69668f8d7b15329af21985349bbc2c8eb3560ccbc82dd173e65be41aa71246b2426fc123f43d45b103371ce47a56d9ba7bda46bc'
-	'3f202f6c21f380f8fd98b34bc7e6d48a94dcb5339e67e71284ef9589b0381dba73ecccdb4f0c3cefd5786e5326e8220c6650ed350c2ba6ea214be9b1232bf253'
-	'b1585c29e3b17f3ba9ad237a1a612749bbc9bc25ed06f0c5862213440b0608ed34b8fdf8e0dbf0b198dc16593120edf9a467c218bb9aac8ab51cfd2867215873'
+	'ea24c7fe19789c82dde144713076c185c258afb103ec35dd3a68320dee8dfc4cb1e9fe0f1045af17798eb8ad9115a4d710d4f6c825d2530a2f60e9f721b7ec40'
+	'1dd9bf5d4d30831397b25e2b6af37167653146aa2dcda489dd66c1d23dac45009f02a520dbcd608cc6b730032ef669d0deb78f20c2f7986567bc5c01a4b5f345'
 	'83642ba8433e1e59ecd2f603098ccebe45a0109bddf1b060a9d95fd958c02f99f86beaf5f26d3c6acadd830f9a579bb2312af534658998fc5a4c56c78244e67d'
 	'cdc948304eed5cfc62de2a953295129a9d9d61ee0be6165397bca6678108052e314d4c0ed4b7211df5a65ebdc39b4738900e7f71b58146b1b3b120bf1cdd4271'
 	'1323dc3bae4f4c9d4a42062abc83f4330014519df78a00a263ac20f9cc489af4d781f1b32a77756ed96b53c44de2bd2bd19c36c193b04f01f40be8c2f5369f7a'
@@ -114,9 +114,9 @@ build() {
 
 	cpus=$(nproc)
 	if [[ $cpus -ge 3 ]]; then
-		bundle install -j$(( cpus - 1 )) --no-cache --no-prune --deployment --without development test ${_wo[@]}
+		bundle-2.1 install -j$(( cpus - 1 )) --no-cache --no-prune --deployment --without development test ${_wo[@]}
 	else
-		bundle install --no-cache --no-prune --deployment --without development test ${_wo[@]}
+		bundle-2.1 install --no-cache --no-prune --deployment --without development test ${_wo[@]}
 	fi
 }
 
diff --git a/gitlab-ci-sidekiq.service b/gitlab-ci-sidekiq.service
index 6bb58f7c21f8..fc82cf732a75 100644
--- a/gitlab-ci-sidekiq.service
+++ b/gitlab-ci-sidekiq.service
@@ -5,12 +5,12 @@ Description=GitLab CI Sidekiq Worker
 Type=forking
 User=gitlab_ci
 WorkingDirectory=<DATADIR>
-Environment=RAILS_ENV=production
+Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
 SyslogIdentifier=gitlab-ci-sidekiq
 PIDFile=/var/run/gitlab-ci/sidekiq.pid
 
-ExecStart=/usr/bin/bundle exec "sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P /run/gitlab-ci/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
-ExecStop=/usr/bin/bundle exec "sidekiqctl stop /run/gitlab-ci/sidekiq.pid >> <DATADIR>/log/sidekiq.log 2>&1"
+ExecStart=/usr/bin/bundle-2.1 exec "sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P /run/gitlab-ci/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
+ExecStop=/usr/bin/bundle-2.1 exec "sidekiqctl stop /run/gitlab-ci/sidekiq.pid >> <DATADIR>/log/sidekiq.log 2>&1"
 
 [Install]
 WantedBy=gitlab-ci.target
diff --git a/gitlab-ci-unicorn.service b/gitlab-ci-unicorn.service
index 36c80c7700ec..ead0c7022856 100644
--- a/gitlab-ci-unicorn.service
+++ b/gitlab-ci-unicorn.service
@@ -4,11 +4,11 @@ Description=GitLab CI Unicorn Server
 [Service]
 User=gitlab_ci
 WorkingDirectory=<DATADIR>
-Environment=RAILS_ENV=production
+Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
 SyslogIdentifier=gitlab-ci-unicorn
 PIDFile=/run/gitlab-ci/unicorn.pid
 
-ExecStart=/usr/bin/bundle exec "unicorn_rails -c <DATADIR>/config/unicorn.rb -E production"
+ExecStart=/usr/bin/bundle-2.1 exec "unicorn_rails -c <DATADIR>/config/unicorn.rb -E production"
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 ExecReload=/usr/bin/kill -USR2 $MAINPID
 
diff --git a/gitlab-ci.install b/gitlab-ci.install
index fb31a410921f..cc873e27d6ae 100644
--- a/gitlab-ci.install
+++ b/gitlab-ci.install
@@ -21,8 +21,8 @@ post_install() {
 	fix_perms
 	echo "You have to configure the database."
 	echo "Configure the application database in ${_etcdir}/database.yml and run:"
-	echo "# su - gitlab_ci -s /bin/sh -c \"cd ${_datadir}; bundle exec rake setup RAILS_ENV=production\""
-	echo "# su - gitlab_ci -s /bin/sh -c \"cd ${_datadir}; bundle exec whenever -w RAILS_ENV=production\""
+	echo "# su - gitlab_ci -s /bin/sh -c \"cd ${_datadir}; bundle-2.1 exec rake setup RAILS_ENV=production\""
+	echo "# su - gitlab_ci -s /bin/sh -c \"cd ${_datadir}; bundle-2.1 exec whenever -w RAILS_ENV=production\""
 	echo "Configure the application in ${_etcdir}/application.yml"
 }
 
@@ -46,7 +46,7 @@ post_upgrade() {
 	pids_dir
 	fix_perms
 
-	su - gitlab_ci -s /bin/sh -c "cd '${_datadir}'; bundle exec rake db:migrate RAILS_ENV=production"
+	su - gitlab_ci -s /bin/sh -c "cd '${_datadir}'; bundle-2.1 exec rake db:migrate RAILS_ENV=production"
 
 	systemctl daemon-reload
 	if [ -e /tmp/gitlab-ci-upgrade-unicorn ]; then