diff --git a/Gemfile b/Gemfile index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_R2VtZmlsZQ==..17686769f4611eefaf33c6a738088afb0acad0e7_R2VtZmlsZQ== 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ require_relative "lib/gitlab/version" -omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.01") +omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.02") # Note that omnibus is from a fork with additional gitlab changes. You can # check what they are with the following comparison link: diff --git a/Gemfile.lock b/Gemfile.lock index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_R2VtZmlsZS5sb2Nr..17686769f4611eefaf33c6a738088afb0acad0e7_R2VtZmlsZS5sb2Nr 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://dev.gitlab.org/gitlab/omnibus.git - revision: 81221aa3b263e717f5fcb57959aa9c8425126d29 - tag: 7.0.10.01 + revision: c33184c00a1774f8350f0f1d8cbce35b99a82fd1 + tag: 7.0.10.02 specs: omnibus (7.0.10) aws-sdk-s3 (~> 1) diff --git a/changelogs/unreleased/4019-version-manifest-information.yml b/changelogs/unreleased/4019-version-manifest-information.yml new file mode 100644 index 0000000000000000000000000000000000000000..17686769f4611eefaf33c6a738088afb0acad0e7_Y2hhbmdlbG9ncy91bnJlbGVhc2VkLzQwMTktdmVyc2lvbi1tYW5pZmVzdC1pbmZvcm1hdGlvbi55bWw= --- /dev/null +++ b/changelogs/unreleased/4019-version-manifest-information.yml @@ -0,0 +1,5 @@ +--- +title: Specify display_version for sofware without proper version string +merge_request: 4622 +author: +type: added diff --git a/config/software/cacerts.rb b/config/software/cacerts.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL2NhY2VydHMucmI=..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL2NhY2VydHMucmI= 100644 --- a/config/software/cacerts.rb +++ b/config/software/cacerts.rb @@ -23,6 +23,7 @@ # Date of the file is in a comment at the start, or in the changelog default_version '2020.01.01' +display_version version.tr('.', '') version '2020.01.01' do source md5: 'c726ae88fd600aa26df1d30f42b51fec' diff --git a/config/software/curl.rb b/config/software/curl.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL2N1cmwucmI=..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL2N1cmwucmI= 100644 --- a/config/software/curl.rb +++ b/config/software/curl.rb @@ -19,6 +19,7 @@ version = Gitlab::Version.new('curl', 'curl-7_59_0') default_version version.print(false) +display_version version.print(false).delete_prefix('curl-').tr('_', '.') # Runtime dependency dependency 'zlib' diff --git a/config/software/krb5.rb b/config/software/krb5.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL2tyYjUucmI=..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL2tyYjUucmI= 100644 --- a/config/software/krb5.rb +++ b/config/software/krb5.rb @@ -20,6 +20,7 @@ version = Gitlab::Version.new('krb5', 'krb5-1.17') default_version version.print(false) +display_version version.print(false).delete_prefix('krb5-') license 'MIT' license_file 'NOTICE' diff --git a/config/software/libicu.rb b/config/software/libicu.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL2xpYmljdS5yYg==..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL2xpYmljdS5yYg== 100644 --- a/config/software/libicu.rb +++ b/config/software/libicu.rb @@ -21,6 +21,7 @@ version = Gitlab::Version.new('libicu', 'release-57-1') default_version version.print(false) +display_version version.print(false).delete_prefix('release-').tr('-', '.') source git: version.remote diff --git a/config/software/libre2.rb b/config/software/libre2.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL2xpYnJlMi5yYg==..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL2xpYnJlMi5yYg== 100644 --- a/config/software/libre2.rb +++ b/config/software/libre2.rb @@ -20,6 +20,7 @@ version = Gitlab::Version.new('libre2', '2016-02-01') default_version version.print(false) +display_version version.print(false).tr('-', '') license 'BSD' license_file 'LICENSE' diff --git a/config/software/omnibus-ctl.rb b/config/software/omnibus-ctl.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL29tbmlidXMtY3RsLnJi..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL29tbmlidXMtY3RsLnJi 100644 --- a/config/software/omnibus-ctl.rb +++ b/config/software/omnibus-ctl.rb @@ -15,7 +15,5 @@ # name 'omnibus-ctl' -# Commit SHA of v0.6.0 is used because the tag is not pushed to the upstream -# repo. Change it to v0.6.0 when that happens. -version = Gitlab::Version.new('omnibus-ctl', '1b96ac486636cac987e5b464810bb3ff673a93fe') +version = Gitlab::Version.new('omnibus-ctl', 'v0.6.0') default_version version.print(false) @@ -21,4 +19,5 @@ default_version version.print(false) +display_version version.print(false) license 'Apache-2.0' license_file 'LICENSE' diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL29wZW5zc2wucmI=..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL29wZW5zc2wucmI= 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -26,6 +26,7 @@ version = Gitlab::Version.new('openssl', 'OpenSSL_1_1_1g') default_version version.print(false) +display_version version.print(false).delete_prefix('OpenSSL_').tr('_', '.') source git: version.remote diff --git a/config/software/registry.rb b/config/software/registry.rb index 7b8b72e54166804afdb0e6b4ed046397b94a3fde_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi..17686769f4611eefaf33c6a738088afb0acad0e7_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi 100644 --- a/config/software/registry.rb +++ b/config/software/registry.rb @@ -22,6 +22,7 @@ version = Gitlab::Version.new('registry', 'v2.10.1-gitlab') default_version version.print(false) +display_version version.print(false).delete_suffix('-gitlab') license 'Apache-2.0' license_file 'LICENSE'