Skip to content
Snippets Groups Projects
Commit e19f23a30d15 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

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: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarClemens Beck <cbeck@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: default avatarClemens Beck <cbeck@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
3 merge requests!128heptapod#1534: making 1.5 the oldstable,!125heptapod#1494: make 1.5 the new stable,!123Omnibus GitLab for upstream 16.10
...@@ -154,6 +154,3 @@ ...@@ -154,6 +154,3 @@
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 @@ ...@@ -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,10 +26,6 @@ ...@@ -28,10 +26,6 @@
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)
...@@ -35,9 +29,10 @@ ...@@ -35,9 +29,10 @@
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment