8.17 uses webpack

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7288
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/8.16-to-8.17.md#4-update-node
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/8.16-to-8.17.md#6-install-libs-migrations-etc

diff --git a/clean-vendor.sh b/clean-vendor.sh
index e9ebdbbbc806b6fc0a5d301fa468cf9a2d1edc45..c110f0b175131ca1e0cd6d27710e4f15ebebe840 100755 (executable)
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -97,7 +97,15 @@ clean_rubygems() {
        rm -rfv gems/rugged-*/vendor
 }
 
+clean_node() {
+       cd $root
+
+       # needed only for webpack during build
+       rm -r node_modules
+}
+
 root=$1
 
 clean_rootfiles
 clean_rubygems
+clean_node

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index f7241515895340303d5e216c8eaa28b68840a9dc..a1b66d2cc2c84d61c08871532efba509e5f4750d 100644 (file)
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -19,7 +19,7 @@
 Summary:       A Web interface to create projects and repositories, manage access and do code reviews
 Name:          gitlab-ce
 Version:       8.17.5
-Release:       0.86
+Release:       0.88
 License:       MIT
 Group:         Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -48,6 +48,8 @@ BuildRequires:        libicu-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libxml2-devel
 BuildRequires: mysql-devel
+BuildRequires: nodejs >= 4.3
+BuildRequires: npm
 BuildRequires: postgresql-devel
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.647
@@ -138,12 +140,19 @@ v=0.25.0b7
 test -d vendor/bundle/ruby/gems/rugged-$v || \
 bundle exec gem install -v $v rugged --no-rdoc --no-ri --verbose
 
+# install webpack deps, used later by rake webpack:compile:
+# node_modules/.bin/webpack --config config/webpack.config.js --bail
+# see vendor/bundle/ruby/gems/webpack-rails-0.9.9/lib/tasks/webpack.rake
+test -d node_modules || \
+npm install
+
 # precompile assets
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/8.17.5+ce.0/config/software/gitlab-rails.rb
 # use modified config so it doesn't croak
 cp -p config/gitlab.yml{,.production}
 sed -i -e '/secret_file:/d' config/gitlab.yml
 sed -i -e 's#/var/lib/gitlab/repositories/#./#' config/gitlab.yml
-bundle exec rake RAILS_ENV=production assets:clean assets:precompile USE_DB=false
+bundle exec rake RAILS_ENV=production assets:clean assets:precompile webpack:compile USE_DB=false
 mv -f config/gitlab.yml{.production,}
 
 # avoid bogus ruby dep