summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-10-05 08:40:40 +0000
committerCan Eldem <celdem@gitlab.com>2020-10-05 08:40:40 +0000
commitae334f0af0155112c345475d9837de8538b58b7a (patch)
tree3eaaf78a2ed01ea7a06624480b09dd70159c9fe5
parent72ff7e5d48614ab69baa1e2a3245cd7cc50d90fc (diff)
parenta4a6f6a7fb56f001d34cbc14d94fa442877e4e57 (diff)
Merge branch 'ruby-2-7-2' into 'master'v3.26.0
Add Ruby version 2.7.2 to Docker image See merge request gitlab-org/security-products/license-management!226
-rw-r--r--.gitlab/deb.yml6
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--config/projects/ruby.rb2
-rw-r--r--config/software/asdf_ruby.rb3
-rw-r--r--lib/license/management/version.rb2
6 files changed, 15 insertions, 4 deletions
diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml
index 2a9a3a7..6c21052 100644
--- a/.gitlab/deb.yml
+++ b/.gitlab/deb.yml
@@ -118,6 +118,12 @@ python-3.3.7:
OMNIBUS_PROJECT: python
PYTHON_VERSION: '3.3.7'
+ruby-2.7.2:
+ extends: .deb
+ variables:
+ OMNIBUS_PROJECT: ruby
+ RUBY_VERSION: '2.7.2'
+
ruby-2.7.1:
extends: .deb
variables:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b4021d..da51998 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v3.26.0
+
+- Add Ruby version 2.7.2 to Docker image. !226
+
## v3.25.8
- Remove bash functions that are not in use !224
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d53243..3153840 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- license-management (3.25.8)
+ license-management (3.26.0)
license_finder (~> 6.7)
GEM
diff --git a/config/projects/ruby.rb b/config/projects/ruby.rb
index 6202715..5ba7ab9 100644
--- a/config/projects/ruby.rb
+++ b/config/projects/ruby.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-ruby_version = ENV.fetch('RUBY_VERSION', '2.7.1')
+ruby_version = ENV.fetch('RUBY_VERSION', '2.7.2')
name "ruby-#{ruby_version}"
maintainer "GitLab B.V."
diff --git a/config/software/asdf_ruby.rb b/config/software/asdf_ruby.rb
index 13b98c5..7849fef 100644
--- a/config/software/asdf_ruby.rb
+++ b/config/software/asdf_ruby.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
name "asdf_ruby"
-default_version "2.7.1"
+default_version "2.7.2"
license "BSD-2-Clause"
license_file "BSDL"
license_file "COPYING"
@@ -15,6 +15,7 @@ dependency "zlib"
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz"
relative_path "ruby-#{version}"
+version("2.7.2") { source sha256: "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" }
version("2.7.1") { source sha256: "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418" }
version("2.7.0") { source sha256: "8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe" }
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 4c03bd5..f67050b 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.25.8'
+ VERSION = '3.26.0'
end
end