From 91f0faf8dfc596dfde052763009fb520635e7fb1 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Tue, 8 Sep 2020 16:12:05 -0600
Subject: fix: do not compress /usr/share

* do not allow license_scanning job to fail
* update script to download *.deb files
* ensure apt db is valid
* Update CHANGELOG and bump version
---
 .gitlab-ci.yml                        | 3 +++
 CHANGELOG.md                          | 4 ++++
 Gemfile.lock                          | 4 ++--
 bin/omnibus                           | 4 ++--
 config/files/.bashrc                  | 1 -
 config/install.sh                     | 6 ++----
 lib/license/management/version.rb     | 2 +-
 spec/integration/dotnet/nuget_spec.rb | 5 +----
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c7a8b7..88849c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,9 @@ dependency_scanning:
 license_scanning:
   image:
     name: $TMP_IMAGE
+  before_script:
+    - apt-get check
   variables:
     LM_REPORT_VERSION: '2.1'
   needs: ['build-docker-image']
+  allow_failure: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbec8f3..0344a7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.25.3
+
+- Ensure `apt-get` db is valid for `before_script` blocks. (!215)
+
 ## v3.25.2
 
 - Roll out `golang` version `1.15.1` to more of the project. (!216)
diff --git a/Gemfile.lock b/Gemfile.lock
index da47682..6b0909c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    license-management (3.25.2)
+    license-management (3.25.3)
       license_finder (~> 6.7)
 
 GEM
@@ -68,7 +68,7 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     libyajl2 (1.2.0)
-    license_finder (6.8.1)
+    license_finder (6.8.2)
       bundler
       rubyzip (>= 1, < 3)
       thor (~> 1.0.1)
diff --git a/bin/omnibus b/bin/omnibus
index 5dd6c58..94622f4 100755
--- a/bin/omnibus
+++ b/bin/omnibus
@@ -85,9 +85,9 @@ case $1 in
       version="$(echo "$job" | cut -d'-' -f2)"
       if echo "$job" | grep '^asdf.*'; then
         name="$(echo "$job" | cut -d'-' -f1)"
-        wget -P pkg/ "${repo_url}/${name}_${version}-1_amd64.deb?job=${job}"
+        wget "${repo_url}/${name}_${version}-1_amd64.deb?job=${job}" -O "pkg/${name}_${version}-1_amd64.deb"
       else
-        wget -P pkg/ "${repo_url}/${job}_${version}-1_amd64.deb?job=${job}"
+        wget "${repo_url}/${job}_${version}-1_amd64.deb?job=${job}" -O "pkg/${job}_${version}-1_amd64.deb"
       fi
     done
     ;;
diff --git a/config/files/.bashrc b/config/files/.bashrc
index 7017be5..61d4ecf 100644
--- a/config/files/.bashrc
+++ b/config/files/.bashrc
@@ -68,7 +68,6 @@ inflate /usr/include.tar.zst /usr
 inflate /usr/lib/gcc.tar.zst /usr/lib
 inflate /usr/lib/git-core.tar.zst /usr/lib
 inflate /usr/lib/llvm-7.tar.zst /usr/lib
-inflate /usr/share.tar.zst /usr
 
 # shellcheck source=/dev/null
 . "$ASDF_DATA_DIR/asdf.sh"
diff --git a/config/install.sh b/config/install.sh
index 3e4c581..4e52827 100644
--- a/config/install.sh
+++ b/config/install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -exuo pipefail
+set -euo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -127,7 +127,6 @@ tar --use-compress-program "$zstd_command" -cf /opt/gitlab/embedded.tar.zst embe
 
 cd /usr
 tar --use-compress-program "$zstd_command" -cf /usr/include.tar.zst include &
-tar --use-compress-program "$zstd_command" -cf /usr/share.tar.zst share &
 
 cd /usr/lib
 tar --use-compress-program "$zstd_command" -cf /usr/lib/gcc.tar.zst gcc &
@@ -145,6 +144,5 @@ rm -fr \
   /usr/include \
   /usr/lib/gcc \
   /usr/lib/git-core \
-  /usr/lib/llvm-7 \
-  /usr/share
+  /usr/lib/llvm-7
 echo -e "section_end:$(date +%s):compress_files\r\e[0K"
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 61167c6..f99a3b6 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.25.2'
+    VERSION = '3.25.3'
   end
 end
diff --git a/spec/integration/dotnet/nuget_spec.rb b/spec/integration/dotnet/nuget_spec.rb
index f640c32..0439125 100644
--- a/spec/integration/dotnet/nuget_spec.rb
+++ b/spec/integration/dotnet/nuget_spec.rb
@@ -220,10 +220,7 @@ RSpec.describe "nuget" do
     context "when the CA certificate is NOT provided" do
       let(:env) { {} }
 
-      specify do
-        expect(subject).to match_schema
-        expect(subject.dependency_names).to match_array(["jive"])
-      end
+      specify { expect(subject).to match_schema }
     end
   end
 end
-- 
cgit v1.2.3