[arch-commits] Commit in gitlab/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, December 23, 2018 @ 00:15:41
  Author: svenstaro
Revision: 417576

upgpkg: gitlab 11.6.0-1

This also uses ruby 2.5 to build this.

Modified:
  gitlab/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-22 23:14:16 UTC (rev 417575)
+++ PKGBUILD	2018-12-23 00:15:41 UTC (rev 417576)
@@ -6,8 +6,11 @@
 # Contributor: Stefan Tatschner <stefan at sevenbyte.org>
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
+# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the
+# commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll
+# need this again at some point in the future.
 pkgname=gitlab
-pkgver=11.5.4
+pkgver=11.6.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -14,7 +17,7 @@
 url="https://gitlab.com/gitlab-org/gitlab-ce"
 license=('MIT')
 options=(!buildflags)
-depends=('ruby2.3' 'git' 'ruby2.3-bundler' 'gitlab-workhorse' 'gitlab-gitaly' 'openssh' 'redis' 'libxslt' 'icu' 're2' 'http-parser' 'nodejs')
+depends=('ruby' 'git' 'ruby-bundler' 'gitlab-workhorse' 'gitlab-gitaly' 'openssh' 'redis' 'libxslt' 'icu' 're2' 'http-parser' 'nodejs')
 makedepends=('cmake' 'postgresql' 'mariadb' 'yarn' 'go' 'nodejs')
 optdepends=('postgresql: database backend'
             'mysql: database backend'
@@ -35,7 +38,7 @@
         gitlab.tmpfiles.d
         gitlab.logrotate)
 install='gitlab.install'
-sha512sums=('23e897bd9588f69512179ee6d67fe48975a7d2e3014ea39b18669af0482b4d1f8c8f5e6e28a2bcbfd444ecc26db3b1786ca283e1f8c2a721eec376473dcb18e4'
+sha512sums=('450d16183f945245e44e4869ad1056f9d2efc1fc54cf9200b5cf9a956936347c6ef6d7cdd2c7a47c3b6d03b53f66e30f6d6ead9423c1547b43f13876b663119e'
             'b1bc7c1f3d47758e4745ae3689e61989c6d1fd8490fa60d75de60d3960025f2888da5c50c4a70e1656d75e4d53bcece518e87f743855eed150a61cb11d40b7d2'
             'ea5ae64214a82b522a09c20be2967ae2ff6fbfd7683587909b748dab4647f99b3128c0e16aba375ecb191e47e1b9045587a84322e216e5cda940904c4fa6271c'
             '69e6f43008389fb54bba6cea61adb0dbf5b75c5796f5cca327326f20f329365c003847bbd6d53b113a0afb1a0d3a0b101a92476739daf85f65c670a1d4466f9c'
@@ -106,7 +109,7 @@
   echo "Fetching bundled gems..."
 
   # Gems will be installed into vendor/bundle
-  bundle-2.3 install --no-cache --deployment --without development test aws kerberos
+  bundle install --no-cache --deployment --without development test aws kerberos
 
   # We'll temporarily stick this in here so we can build the assets
   cp config/database.yml.postgresql.orig config/database.yml
@@ -114,8 +117,8 @@
   sed -i 's/url.*/nope.sock/g' config/resque.yml
 
   yarn install --production --pure-lockfile
-  bundle-2.3 exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
-  bundle-2.3 exec rake gettext:compile RAILS_ENV=production
+  bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
+  bundle exec rake gettext:compile RAILS_ENV=production
 
   # After building assets, clean this up again
   rm config/database.yml config/database.yml.postgresql.orig
@@ -169,16 +172,6 @@
 
   sed -i "s|require_relative '../lib|require '${_datadir}/lib|" config/application.rb
 
-  # Fix for ruby-2.3 and bundle-2.3
-  sed -i "s|bundle|bundle-2.3|g" "${pkgdir}${_datadir}/lib/tasks/gitlab/check.rake"
-  grep -rl "bin/env ruby" "${pkgdir}${_datadir}" | xargs sed -i "s|bin/env ruby$|bin/env ruby-2.3|g"
-  sed -i \
-    -e "s|ruby --version|ruby-2.3 --version|g" \
-    -e "s|gem --version|gem-2.3 --version|g" \
-    -e "s|bundle --version|bundle-2.3 --version|g" \
-    -e "s|rake --version|rake-2.3 --version|g" \
-    "${pkgdir}${_datadir}/lib/tasks/gitlab/info.rake"
-
   # Install config files
   for config_file in application.rb gitlab.yml unicorn.rb resque.yml; do
     mv "config/${config_file}" "${pkgdir}${_etcdir}/"