Skip to content
Snippets Groups Projects
Commit 60ce33df6596 authored by Andrew Patterson's avatar Andrew Patterson
Browse files

Only run license_finder for language appropriate packages

Run license_finder with "--enabled-package-managers godep gomodules"
dependecies that only use go. This prevents license checks for unrelated
gem packages that are never used in the dependency.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6998
parent 65388080de47
No related branches found
No related tags found
1 merge request!85Merged upstream 15.5.0+rc42.ce.0
......@@ -47,6 +47,6 @@
command "go build -ldflags '#{prom_version.print_ldflags}' ./cmd/alertmanager", env: env, cwd: cwd
copy 'alertmanager', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/alertmanager.json"
end
......@@ -35,6 +35,6 @@
mkdir "#{install_dir}/embedded/bin"
copy 'bin/consul', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/consul.json"
end
......@@ -34,6 +34,6 @@
command "go build -ldflags '-s -w' ./cmds/docker-distribution-pruner", env: env
copy 'docker-distribution-pruner', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/docker-distribution-pruner.json"
end
......@@ -40,6 +40,6 @@
make 'gitlab-pages', env: env
move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages"
command "license_finder report --enabled-package-managers godep gomodules dep --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/gitlab-pages.json"
end
......@@ -44,6 +44,6 @@
command "go build -ldflags '#{prom_version.print_ldflags}'", env: env
copy 'node_exporter', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/node-exporter.json"
end
......@@ -43,6 +43,6 @@
command "go build -mod=vendor -ldflags '#{prom_version.print_ldflags}'", env: env
copy 'pgbouncer_exporter', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/pgbouncer-exporter.json"
end
......@@ -41,6 +41,6 @@
command "go build -ldflags '#{prom_version.print_ldflags}' ./cmd/postgres_exporter", env: env
copy 'postgres_exporter', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/postgres-exporter.json"
end
......@@ -47,6 +47,6 @@
command "go build -ldflags '#{ldflags}'", env: env
copy 'redis_exporter', "#{install_dir}/embedded/bin/"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json"
copy "license.json", "#{install_dir}/licenses/redis-exporter.json"
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment