diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 17:11:50 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-29 13:53:20 +0200 |
| commit | d7a4c1d2a5f395ca6ddb2dc2608ac33ccebf8a74 (patch) | |
| tree | 0876a512726d727087c72e045866cc5aca01fe42 /scripts/static-analysis | |
| parent | ca05130319ae9d74ee7771b5a8adb6cf25857fb7 (diff) | |
| download | gitlab-ce-d7a4c1d2a5f395ca6ddb2dc2608ac33ccebf8a74.tar.gz | |
Backport EE changes made to the scripts/ directoryresolve-scripts-differences
This backport changes made by EE to the files in the scripts/ directory.
This comes with a few changes to some scripts to make them work in the
single codebase setup.
Diffstat (limited to 'scripts/static-analysis')
| -rwxr-xr-x | scripts/static-analysis | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/static-analysis b/scripts/static-analysis index 642c50ec0a8..6fd64fbf9da 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -1,6 +1,7 @@ #!/usr/bin/env ruby # We don't have auto-loading here +require_relative '../lib/gitlab' require_relative '../lib/gitlab/popen' require_relative '../lib/gitlab/popen/runner' @@ -36,6 +37,10 @@ tasks = [ %w[scripts/lint-rugged] ] +if Gitlab.ee? + tasks.unshift(%w[ruby -rbundler/setup scripts/ee_specific_check/ee_specific_check.rb]) +end + static_analysis = Gitlab::Popen::Runner.new static_analysis.run(tasks) do |cmd, &run| |