Skip to content
Snippets Groups Projects
Commit 1b066035 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'revert-381b26e1' into 'master'

Revert "Merge branch 'license-finder-rails' into 'master'"

See merge request gitlab-org/omnibus-gitlab!3714
parents b21bf3a0 a0b863a8
No related branches found
No related tags found
No related merge requests found
......@@ -155,9 +155,6 @@
move "#{Omnibus::Config.source_dir}/gitlab-rails/tmp/cache", "#{Omnibus::Config.project_root}/assets_cache"
move "#{Omnibus::Config.source_dir}/gitlab-rails/.yarn-cache", Omnibus::Config.project_root.to_s
bundle "exec license_finder report --decisions-file=config/dependency_decisions.yml --format=csv --save=licenses.csv", env: env
copy 'licenses.csv', "#{install_dir}/licenses/gitlab-rails.csv"
# Tear down now that gitlab:assets:compile is done.
delete 'node_modules'
delete 'config/gitlab.yml'
......@@ -202,6 +199,12 @@
ee/app/assets
)
# This directory will be deleted after all the licenses copied to it are
# handled by the DependencyInformation task of omnibus. It won't be part
# of the final package, thus causing a redundancy.
# TODO: Instead of relying on upstream provided file, run license_finder here
copy 'vendor/licenses.csv', "#{install_dir}/licenses/gitlab-rails.csv"
# Create a wrapper for the rake tasks of the Rails app
erb dest: "#{install_dir}/bin/gitlab-rake",
source: 'bundle_exec_wrapper.erb',
......
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