Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/scripts/static-analysis b/scripts/static-analysis
index 6ad7c0b19c3..de5a1b407f9 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -27,6 +27,16 @@ class StaticAnalysis
     end
   end
 
+  def self.project_path
+    project_root = File.expand_path('..', __dir__)
+
+    if Gitlab.jh?
+      "#{project_root}/jh"
+    else
+      project_root
+    end
+  end
+
   # `gettext:updated_check` and `gitlab:sidekiq:sidekiq_queues_yml:check` will fail on FOSS installations
   # (e.g. gitlab-org/gitlab-foss) since they test against a single
   # file that is generated by an EE installation, which can
@@ -42,7 +52,7 @@ class StaticAnalysis
     Task.new(%w[bundle exec rubocop --parallel], 60),
     Task.new(%w[yarn run lint:prettier], 160),
     Task.new(%w[bin/rake gettext:lint], 85),
-    Task.new(%w[bundle exec license_finder], 20),
+    Task.new(%W[bundle exec license_finder --decisions-file config/dependency_decisions.yml --project-path #{project_path}], 20),
     Task.new(%w[bin/rake lint:static_verification], 35),
     Task.new(%w[bin/rake config_lint], 10),
     Task.new(%w[bin/rake gitlab:sidekiq:all_queues_yml:check], 15),