From 1788269fb9b275cfff12ff476c1a41399caedbd8 Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 10 Aug 2020 09:43:50 -0600 Subject: Unpack Rust deb package before asdf install --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/license/management/version.rb | 2 +- run.sh | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fb5fdb..b650a70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.21.1 + +- Unpack Rust Debian package before asdf attempts to compile and install it. (!205) + ## v3.21.0 - Provide limited network connectivity for [cargo](https://doc.rust-lang.org/cargo/) projects (!201) diff --git a/Gemfile.lock b/Gemfile.lock index f37952b..8cfbf1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.21.0) + license-management (3.21.1) license_finder (~> 6.6.0) GEM diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index e3de501..c9f2602 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.21.0' + VERSION = '3.21.1' end end diff --git a/run.sh b/run.sh index f318908..89c2abe 100755 --- a/run.sh +++ b/run.sh @@ -75,6 +75,8 @@ function prepare_python() { } function prepare_tools() { + dpkg -i /opt/toolcache/rust*.deb + if ! asdf current 2> >(grep -q 'is not installed'); then echo "Installing missing tools…" asdf install -- cgit v1.2.3