Download as
Browse Code »

Commit ee4455cb196b544b1eb464a32c10a5eaa96743a9

Authored by David Silva
1 parent 6ac4b415
Exists in gitlab-8.x

Run bundle with rh-ruby22 package

Showing 1 changed file with 6 additions and 9 deletions   Show diff stats
Makefile
  Diff comments   View file @ee4455c
... ... @@ -3,10 +3,6 @@ export LD_LIBRARY_PATH := /opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${
3 3 export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH
4 4 export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
5 5 export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}
6   -export LD_LIBRARY_PATH := /opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
7   -export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH
8   -export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
9   -export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}
10 6  
11 7 VERSION = 8.5
12 8 TARBALL = gitlab-deps-$(VERSION).tar.gz
... ... @@ -14,14 +10,14 @@ PREFIX = /usr
14 10 WGET = wget
15 11 GITLAB_BRANCH = 8-5-stable
16 12 BUNDLE_OPTS = --verbose --without='development test'
  13 +BUNDLE = LD_LIBRARY_PATH=/opt/rh/rh-ruby22/root/usr/lib64/ /opt/rh/rh-ruby22/root/bin/bundle
17 14  
18 15 all:
19   - ruby -v
20   - bundle install $(BUNDLE_OPTS) --local --deployment
  16 + $(BUNDLE) install $(BUNDLE_OPTS) --local --deployment
21 17 grep -rl '/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby' vendor/bundle/ruby/gems/*/bin | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/usr/bin/env ruby|'
22 18  
23 19 # Change ruby interpreter, to use rh-ruby22
24   - grep -rl '#!/usr/bin/env ruby' vendor/bundle/ruby/gems/ | xargs --no-run-if-empty sed -i -e 's|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby |'
  20 + grep -rl '#!/usr/bin/env ruby' vendor/ | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby|'
25 21  
26 22 dist: $(TARBALL)
27 23  
... ... @@ -34,13 +30,14 @@ install: all
34 30 install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/gitlab
35 31 cp -r .bundle $(DESTDIR)$(PREFIX)/lib/gitlab/.bundle
36 32 cp -r vendor/bundle $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
  33 + grep -rl '#!/usr/bin/env ruby' vendor/ | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby|'
37 34  
38 35 update: clean
39 36 $(WGET) -O Gemfile https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile
40 37 $(WGET) -O Gemfile.lock https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile.lock
41 38 echo 'gem "omniauth-remote-user", ">= 0.0.6"' >> Gemfile
42   - bundle update
43   - bundle install $(BUNDLE_OPTS) --path vendor/bundle
  39 + $(BUNDLE) update
  40 + $(BUNDLE) install $(BUNDLE_OPTS) --path vendor/bundle
44 41  
45 42  
46 43 clean:
... ...