Skip to content

Commit 935b1e0

Browse files
balasankarcstanhu
andcommitted
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 <[email protected]> Approved-by: Clemens Beck <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Reviewed-by: Clemens Beck <[email protected]> Co-authored-by: Stan Hu <[email protected]>
2 parents c6941b7 + 2fc9d05 commit 935b1e0

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

.custom_sources.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,3 @@ ncurses:
154154
pgbouncer:
155155
remote: "[email protected]:omnibus-mirror/pgbouncer.git"
156156
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/pgbouncer.git"
157-
ruby-shadow:
158-
remote: "[email protected]:omnibus-mirror/ruby-shadow.git"
159-
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/ruby-shadow.git"

config/software/ruby-shadow.rb

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
#
1717

1818
name 'ruby-shadow'
19-
# From https://github.com/chef/chef/blob/3c35bd0e1d17a5bfd779fab3cc7860ea1923dec6/Gemfile#L41-L44
20-
version = Gitlab::Version.new('ruby-shadow', 'e408599fdba93340500dad8922e9ca75072879de')
21-
default_version version.print(false)
22-
display_version version.print(false)
19+
20+
default_version '2.5.1'
2321

2422
license 'Apache-2.0'
2523
license_file 'LICENSE'
@@ -28,16 +26,13 @@
2826

2927
dependency 'rubygems'
3028

31-
source git: version.remote
32-
33-
relative_path 'ruby-shadow'
34-
3529
build do
3630
env = with_standard_compiler_flags(with_embedded_path)
3731

38-
# Remove existing built gems in case they exist in the current dir
39-
delete 'ruby-shadow-*.gem'
40-
41-
gem 'build ruby-shadow.gemspec', env: env
42-
gem 'install ruby-shadow-*.gem --no-document', env: env
32+
gem 'install gitlab-ruby-shadow' \
33+
" --clear-sources" \
34+
" -s https://rubygems.org" \
35+
" --version '#{version}'" \
36+
" --bindir '#{install_dir}/embedded/bin'" \
37+
' --no-document', env: env
4338
end

0 commit comments

Comments
 (0)