diff options
| -rw-r--r-- | .gitlab/deb.yml | 1 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Dockerfile | 12 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/finder/ext/nuget.rb | 13 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml index 20b7c93..27d5554 100644 --- a/.gitlab/deb.yml +++ b/.gitlab/deb.yml @@ -59,6 +59,7 @@ mono-6: variables: OMNIBUS_PROJECT: mono MONO_VERSION: '6.8.0.123' + allow_failure: false nodejs-10: extends: .deb diff --git a/CHANGELOG.md b/CHANGELOG.md index b650a70..4d55c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.22.0 + +- Unpack mono from custom built deb package (!204) + ## v3.21.1 - Unpack Rust Debian package before asdf attempts to compile and install it. (!205) @@ -1,14 +1,4 @@ # syntax = docker/dockerfile:experimental -FROM debian:stable AS mono-builder -RUN apt-get update -q -RUN apt-get install --no-install-recommends -y apt-transport-https dirmngr gnupg ca-certificates -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -RUN echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list -RUN apt-get update -q -RUN mv /etc/apt/apt.conf.d/docker-clean /etc/apt/apt.conf.d/docker-clean.bak -RUN apt-get install -y --no-install-recommends nuget referenceassemblies-pcl ca-certificates-mono -RUN mkdir -p /opt/toolcache && cp /var/cache/apt/archives/*.deb /opt/toolcache/ - FROM debian:stable-slim ENV ASDF_DATA_DIR="/opt/asdf" ENV PATH="${ASDF_DATA_DIR}/shims:${ASDF_DATA_DIR}/bin:/opt/gitlab/.local/bin:${PATH}" @@ -16,7 +6,7 @@ ENV TERM="xterm" WORKDIR /opt/gitlab COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc RUN mkdir -p /opt/toolcache -COPY --from=mono-builder /opt/toolcache/*.deb /opt/toolcache/mono/ +COPY pkg/mono*.deb /opt/toolcache/ COPY pkg/license*.deb /opt/toolcache/ COPY pkg/rust*.deb /opt/toolcache/ COPY config/install.sh /opt/install.sh diff --git a/Gemfile.lock b/Gemfile.lock index 8cfbf1d..8053899 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.21.1) + license-management (3.22.0) license_finder (~> 6.6.0) GEM 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 |