summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-02-24 08:37:50 -0700
committermo khan <mo.khan@gmail.com>2020-02-24 09:35:27 -0700
commit525d7cb9a30bb14306d6a00919dc25313c632b64 (patch)
treeff17c94c685c8c86b95ce4e7994e70b1f00e6253
parent1bd03175f997d381eaac4b2d3756b5d179e697e5 (diff)
Ensure both bundler 1.x and 2.x is installedv2.5.1
* Lock version to license_finder 6.0.0
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock4
-rw-r--r--lib/license/management/version.rb2
-rw-r--r--license-management.gemspec2
-rwxr-xr-xrun.sh1
5 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17c714..cf7d4be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v2.5.1
+
+- Install bundler `1.x` and `2.x` (!116)
+
## v2.5.0
- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/releases/tag/v6.0.0) to version `6.0.0` (!112)
diff --git a/Gemfile.lock b/Gemfile.lock
index 39c1142..0a3b33a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
- license-management (2.5.0)
- license_finder (~> 6.0)
+ license-management (2.5.1)
+ license_finder (~> 6.0.0)
GEM
remote: https://rubygems.org/
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 69fb69d..5717fbe 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '2.5.0'
+ VERSION = '2.5.1'
end
end
diff --git a/license-management.gemspec b/license-management.gemspec
index 9acbcaf..1ff11b0 100644
--- a/license-management.gemspec
+++ b/license-management.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
- spec.add_dependency 'license_finder', '~> 6.0'
+ spec.add_dependency 'license_finder', '~> 6.0.0'
spec.add_development_dependency 'json-schema', '~> 2.8'
spec.add_development_dependency 'rspec', '~> 3.9'
end
diff --git a/run.sh b/run.sh
index c7b9950..7296e00 100755
--- a/run.sh
+++ b/run.sh
@@ -118,6 +118,7 @@ case "$COMMAND" in
# So we ignore the error.
$($rvm_recommended_ruby) 2>/dev/null || true
rvm use .
+ gem install --no-document 'bundler:~> 1.7' 'bundler:~> 2.0'
bundler_version=$(grep -A1 "BUNDLED WITH" Gemfile.lock | tail -n 1)
gem install bundler -v "${bundler_version}" || gem install bundler
# rvm pulls outdated gems