Commit d88a980e869979520467847b43e64ee57d3102ef
1 parent
c12c0b05
Exists in
master
and in
1 other branch
fix update target
Showing
1 changed file
with
3 additions
and
9 deletions
Show diff stats
Makefile
| @@ -18,16 +18,10 @@ install: all | @@ -18,16 +18,10 @@ install: all | ||
| 18 | cp -r .bundle $(DESTDIR)$(PREFIX)/lib/gitlab/.bundle | 18 | cp -r .bundle $(DESTDIR)$(PREFIX)/lib/gitlab/.bundle |
| 19 | cp -r vendor/bundle $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle | 19 | cp -r vendor/bundle $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle |
| 20 | 20 | ||
| 21 | -update: clean bundle | ||
| 22 | - | ||
| 23 | -bundle: | ||
| 24 | - bundle install $(BUNDLE_OPTS) --path vendor/bundle | ||
| 25 | - | ||
| 26 | -update-gemfiles: | 21 | +update: clean |
| 27 | $(WGET) -O Gemfile https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile | 22 | $(WGET) -O Gemfile https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile |
| 28 | - $(WGET) -O Gemfile.lock https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile.lock | ||
| 29 | - git add Gemfile* | ||
| 30 | - git commit Gemfile* -m 'update Gemfile*' | 23 | + $(RM) Gemfile.lock |
| 24 | + bundle install $(BUNDLE_OPTS) --path vendor/bundle | ||
| 31 | 25 | ||
| 32 | clean: | 26 | clean: |
| 33 | $(RM) -r .bundle/ vendor/bundle/ $(TARBALL) | 27 | $(RM) -r .bundle/ vendor/bundle/ $(TARBALL) |