Skip to content
Snippets Groups Projects
Commit 9356dc50 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'include-license-and-notice-in-license-finder-output' into 'master'

Include license and notice in license_finder output

See merge request gitlab-org/omnibus-gitlab!5722
parents 37f0fa04 b3341182
No related branches found
No related tags found
2 merge requests!60Heptapod 0.28 is the new stable,!56Heptapod 0.28 / GitLab 14.5
Showing with 18 additions and 18 deletions
......@@ -2,7 +2,7 @@
require_relative "lib/gitlab/version"
omnibus_gem_version = Gitlab::Version.new('omnibus', "8.2.1.1")
omnibus_gem_version = Gitlab::Version.new('omnibus', "8.2.1.2")
# Note that omnibus is from a fork with additional gitlab changes. You can
# check what they are with the following comparison link:
......
GIT
remote: https://dev.gitlab.org/gitlab/omnibus.git
revision: 64214a0ee5fdf5780f5875c7f2daf04b6c0de53d
tag: 8.2.1.1
revision: 3d4e4f11afec5fba1049c6b26bbbd175bfff230f
tag: 8.2.1.2
specs:
omnibus (8.2.1)
aws-sdk-s3 (~> 1)
......
......@@ -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 --save=license.json"
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"
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 --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/consul.json"
end
......@@ -33,6 +33,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 --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/docker-distribution-pruner.json"
end
......@@ -71,6 +71,6 @@
end
end
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/gitaly.json"
end
......@@ -33,6 +33,6 @@
env = with_standard_compiler_flags(with_embedded_path)
make "install PREFIX=#{install_dir}/embedded", env: env
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/gitlab-elasticsearch-indexer.json"
end
......@@ -33,6 +33,6 @@
make 'kas', env: env
move 'build/kas', "#{install_dir}/embedded/bin/gitlab-kas"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/gitlab-kas.json"
end
......@@ -35,6 +35,6 @@
make 'gitlab-pages', env: env
move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/gitlab-pages.json"
end
......@@ -148,8 +148,8 @@
move "#{Omnibus::Config.source_dir}/gitlab-rails/tmp/cache", "#{Omnibus::Config.project_root}/assets_cache"
move "#{Omnibus::Config.source_dir}/gitlab-rails/node_modules", Omnibus::Config.project_root.to_s
bundle "exec license_finder report --decisions-file=config/dependency_decisions.yml --format=json --save=rails-license.json", env: env
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=workhorse-license.json", cwd: "#{Omnibus::Config.source_dir}/gitlab-rails/workhorse"
bundle "exec license_finder report --decisions-file=config/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=rails-license.json", env: env
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=workhorse-license.json", cwd: "#{Omnibus::Config.source_dir}/gitlab-rails/workhorse"
# Merge rails and workhorse license files.
block "Merge license files of rails and workhorse" do
......
......@@ -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 --save=license.json"
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"
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 --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/pgbouncer-exporter.json"
end
......@@ -45,6 +45,6 @@
command "go build -ldflags '#{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 --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/postgres-exporter.json"
end
......@@ -47,6 +47,6 @@
command "go build -tags netgo,builtinassets -ldflags '#{prom_version.print_ldflags}' ./cmd/prometheus", env: env, cwd: cwd
copy 'prometheus', "#{install_dir}/embedded/bin/prometheus"
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/prometheus.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 --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/redis-exporter.json"
end
......@@ -43,6 +43,6 @@
make "binaries", env: env, cwd: cwd
move "#{cwd}/bin/*", "#{install_dir}/embedded/bin", force: true
command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --save=license.json"
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"
copy "license.json", "#{install_dir}/licenses/registry.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