Merge branch 'sh-prepare-re2-2' into 'master'

balasankarc · stanhu · balasankarc · commit eca9f47a7fee · 2023-09-14T15:26:52.000Z
Add clean up steps in preparation for re2 v2.0 gem See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7133 Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com> Approved-by: Clemens Beck <cbeck@gitlab.com> Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com> Co-authored-by: Stan Hu <stanhu@gmail.com>
diff --git a/config/projects/gitlab.rb b/config/projects/gitlab.rb
@@ -261,6 +261,7 @@
 exclude 'embedded/lib/ruby/gems/*/gems/nokogumbo-*/ext'
 exclude 'embedded/lib/ruby/gems/*/gems/rbtrace-*/ext/src'
 exclude 'embedded/lib/ruby/gems/*/gems/rbtrace-*/ext/dst'
+exclude 'embedded/lib/ruby/gems/*/gems/re2-*/ports'
 exclude 'embedded/lib/ruby/gems/*/gems/*pg_query-*/ext'
 
 # Exclude exe files from Python libraries
diff --git a/config/software/gitlab-rails.rb b/config/software/gitlab-rails.rb
@@ -137,7 +137,8 @@
       'google-protobuf' => 'lib/google',
       'grpc' => 'src/ruby/lib/grpc',
       'prometheus-client-mmap' => 'lib',
-      'nokogiri' => 'lib'
+      'nokogiri' => 'lib',
+      're2' => 'lib'
     }
 
     # Delete unused shared libraries included in the gems

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@`
`137`	`137`	`'google-protobuf' => 'lib/google',`
`138`	`138`	`'grpc' => 'src/ruby/lib/grpc',`
`139`	`139`	`'prometheus-client-mmap' => 'lib',`
`140`		`- 'nokogiri' => 'lib'`
	`140`	`+ 'nokogiri' => 'lib',`
	`141`	`+ 're2' => 'lib'`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`# Delete unused shared libraries included in the gems`