Download as
Browse Code »

Commit c73d4497fdd1d396b5b2e3c57838aa7f0f417c6f

Authored by Jacob Vosmaer
1 parent 1c514868
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Move build-time EE check into a script

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
Makefile
  Diff comments   View file @c73d449
... ... @@ -25,7 +25,7 @@ remove_json:
25 25 find pkg/ -name '*.json' -delete
26 26  
27 27 move_ee_to_secret_dir:
28   - if (git describe | grep -q -w ee); then \
  28 + if support/is_gitlab_ee.sh ; then \
29 29 mv pkg ${SECRET_DIR} \
30 30 && mkdir pkg \
31 31 && mv ${SECRET_DIR} pkg/ \
... ...
support/is_gitlab_ee.sh 0 → 100755
  Diff comments   View file @c73d449
... ... @@ -0,0 +1,2 @@
  1 +#!/bin/bash
  2 +[[ -n $ee ]] || grep -q '^source.*"git@gitlab.com:subscribers/gitlab-ee.git"' config/software/gitlab-rails.rb
... ...