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

Anatol Pomozov anatolik at archlinux.org
Tue May 26 08:13:27 UTC 2020


    Date: Tuesday, May 26, 2020 @ 08:13:26
  Author: anatolik
Revision: 635009

Creating a fake config is not needed for assets build anymore. Remove it.

Modified:
  gitlab/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ------------
 1 file changed, 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 08:11:55 UTC (rev 635008)
+++ PKGBUILD	2020-05-26 08:13:26 UTC (rev 635009)
@@ -81,9 +81,6 @@
   cp config/resque.yml.example config/resque.yml
   cp config/puma.rb.example config/puma.rb
 
-  # We need this one untouched because otherwise assets will fail
-  # cp config/database.yml.postgresql config/database.yml.postgresql.orig
-
   echo "Setting up systemd service files ..."
   for service_file in gitlab-sidekiq.service gitlab-puma.service gitlab.logrotate gitlab-backup.service gitlab-mailroom.service; do
     sed -i "s|<HOMEDIR>|${_homedir}|g" "${srcdir}/${service_file}"
@@ -114,18 +111,9 @@
   patch -p1 < $srcdir/ruby27-pop-extra-arg.patch
   popd
 
-  # We'll temporarily stick this in here so we can build the assets
-  # cp config/database.yml.postgresql.orig config/database.yml
-  # cp config/resque.yml.example config/resque.yml
-  # sed -i 's/url.*/nope.sock/g' config/resque.yml
-
   yarn install --production --pure-lockfile
   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
-  # mv config/resque.yml.patched config/resque.yml
 }
 
 package() {


More information about the arch-commits mailing list