Merge branch 'sh-use-gitlab-ruby-shadow' into 'master'
Use gitlab-ruby-shadow gem instead of shadow source See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7418 Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com> Approved-by: Clemens Beck <cbeck@gitlab.com> Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com> Reviewed-by: Clemens Beck <cbeck@gitlab.com> Co-authored-by: Stan Hu <stanhu@gmail.com>
This commit is contained in:
commit
935b1e012b
|
@ -154,6 +154,3 @@ ncurses:
|
||||||
pgbouncer:
|
pgbouncer:
|
||||||
remote: "git@dev.gitlab.org:omnibus-mirror/pgbouncer.git"
|
remote: "git@dev.gitlab.org:omnibus-mirror/pgbouncer.git"
|
||||||
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/pgbouncer.git"
|
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/pgbouncer.git"
|
||||||
ruby-shadow:
|
|
||||||
remote: "git@dev.gitlab.org:omnibus-mirror/ruby-shadow.git"
|
|
||||||
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/ruby-shadow.git"
|
|
||||||
|
|
|
@ -16,10 +16,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
name 'ruby-shadow'
|
name 'ruby-shadow'
|
||||||
# From https://github.com/chef/chef/blob/3c35bd0e1d17a5bfd779fab3cc7860ea1923dec6/Gemfile#L41-L44
|
|
||||||
version = Gitlab::Version.new('ruby-shadow', 'e408599fdba93340500dad8922e9ca75072879de')
|
default_version '2.5.1'
|
||||||
default_version version.print(false)
|
|
||||||
display_version version.print(false)
|
|
||||||
|
|
||||||
license 'Apache-2.0'
|
license 'Apache-2.0'
|
||||||
license_file 'LICENSE'
|
license_file 'LICENSE'
|
||||||
|
@ -28,16 +26,13 @@ skip_transitive_dependency_licensing true
|
||||||
|
|
||||||
dependency 'rubygems'
|
dependency 'rubygems'
|
||||||
|
|
||||||
source git: version.remote
|
|
||||||
|
|
||||||
relative_path 'ruby-shadow'
|
|
||||||
|
|
||||||
build do
|
build do
|
||||||
env = with_standard_compiler_flags(with_embedded_path)
|
env = with_standard_compiler_flags(with_embedded_path)
|
||||||
|
|
||||||
# Remove existing built gems in case they exist in the current dir
|
gem 'install gitlab-ruby-shadow' \
|
||||||
delete 'ruby-shadow-*.gem'
|
" --clear-sources" \
|
||||||
|
" -s https://rubygems.org" \
|
||||||
gem 'build ruby-shadow.gemspec', env: env
|
" --version '#{version}'" \
|
||||||
gem 'install ruby-shadow-*.gem --no-document', env: env
|
" --bindir '#{install_dir}/embedded/bin'" \
|
||||||
|
' --no-document', env: env
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue