diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-08-11 09:48:38 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-08-11 09:48:38 +0000 |
| commit | d12215d3b7d209e6e442e6dcf099b0500c9618cb (patch) | |
| tree | 6f34f5fdcde9b8af115f02a6dd8c595f9cec0ec5 /lib | |
| parent | 76fa7272e6f8fe623b5c129c2c8ba2696bb94207 (diff) | |
| parent | e12bdfa1dc4662f3130f3d46354d0d2f77d1a524 (diff) | |
Merge branch '217904-deb-mono' into 'master'v3.22.0
Bundle mono deb package.
See merge request gitlab-org/security-products/license-management!204
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/license/finder/ext/nuget.rb | 13 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb index 17674e6..5e689d4 100644 --- a/lib/license/finder/ext/nuget.rb +++ b/lib/license/finder/ext/nuget.rb @@ -3,11 +3,16 @@ module LicenseFinder class Nuget def prepare - shell.execute(['apt-get', :install, '-y', '/opt/toolcache/mono/*.deb']) + shell.execute(['apt-get', :install, '-y', '/opt/toolcache/mono*.deb']) create_vendor_path Dir.chdir(project_path) do shell.execute([ - :mono, '/usr/local/bin/nuget.exe', + '/opt/asdf/installs/mono/6.8.0.123/bin/cert-sync', + shell.default_certificate_path + ]) + shell.execute([ + '/opt/asdf/installs/mono/6.8.0.123/bin/mono', + '/opt/asdf/installs/mono/6.8.0.123/bin/nuget.exe', :restore, detected_package_path, '-LockedMode', '-NoCache', @@ -17,8 +22,8 @@ module LicenseFinder end end - def installed?(*args) - File.exist?('/usr/local/bin/nuget.exe') + def installed?(*) + true end def current_packages diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index c9f2602..518fa69 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.21.1' + VERSION = '3.22.0' end end |