Adjust JH Gemfile.lock (!1778) · 合并请求 · gitlab-cn / GitLab

Baodong请求将refactor-jh-gem-sync合并到main-jh 6月 26, 2023

Paired MR(Non Dependent):

What does this MR do and why?

Suggestion from Upstream comment: https://gitlab.com/gitlab-org/gitlab/-/issues/415832#note_1439680638

In this way, we reuse the Gemfile of Upstream.

So, we can remove the useless file jh/Gemfile.jh, and remove the step of merging Gemfile.

Note that we still need to do special processing for the path directory of the lock file: jh/bin/adjust_gemfile_lock

Will be removed after refactor completes:

jh/bin/build_static_gemfile
jh/Gemfile.jh

Screenshots or screen recordings

Non-UI

How to set up and validate locally

checkout current branch, mock code-sync scripts

./jh/bin/merge_checksum
./jh/bin/adjust_gemfile_lock
git diff jh/Gemfile.lock > 1.diff
bundle install
git diff jh/Gemfile.lock > 2.diff

1.diff

diff --git a/jh/Gemfile.lock b/jh/Gemfile.lock
index 279c5bc9c085..ec0417598919 100644
--- a/jh/Gemfile.lock
+++ b/jh/Gemfile.lock
@@ -1,38 +1,66 @@
-GIT
-  remote: https://github.com/TencentCloud/tencentcloud-sdk-ruby.git
-  revision: a02d46963a57b0d48ef112e3fba208e911de9be9
-  tag: 1.0.200
-  glob: tencentcloud-sdk-captcha/tencentcloud-sdk-captcha.gemspec
+PATH
+  remote: ../gems/activerecord-gitlab
+  specs:
+    activerecord-gitlab (0.2.0)
+      activerecord (>= 7)
+
+PATH
+  remote: ../gems/click_house-client
+  specs:
+    click_house-client (0.1.0)
+      activesupport (< 8)
+      addressable (~> 2.8)
+      json (~> 2.6.3)
+
+PATH
+  remote: ../gems/error_tracking_open_api
   specs:
-    tencentcloud-sdk-captcha (1.0.200)
-      tencentcloud-sdk-common (~> 1.0)
+    error_tracking_open_api (1.0.0)
+      typhoeus (~> 1.0, >= 1.0.1)
 
-GIT
-  remote: https://github.com/TencentCloud/tencentcloud-sdk-ruby.git
-  revision: a02d46963a57b0d48ef112e3fba208e911de9be9
-  tag: 1.0.200
-  glob: tencentcloud-sdk-common/tencentcloud-sdk-common.gemspec
+PATH
+  remote: ../gems/gitlab-rspec
   specs:
-    tencentcloud-sdk-common (1.0.200)
+    gitlab-rspec (0.1.0)
+      activesupport (>= 6.1, < 7.1)
+      rspec (~> 3.0)
 
-GIT
-  remote: https://github.com/TencentCloud/tencentcloud-sdk-ruby.git
-  revision: a02d46963a57b0d48ef112e3fba208e911de9be9
-  tag: 1.0.200
-  glob: tencentcloud-sdk-sms/tencentcloud-sdk-sms.gemspec
+PATH
+  remote: ../gems/gitlab-safe_request_store
   specs:
-    tencentcloud-sdk-sms (1.0.200)
-      tencentcloud-sdk-common (~> 1.0)
+    gitlab-safe_request_store (0.1.0)
+      request_store
 
-GIT
-  remote: https://jihulab.com/gitlab-cn/ruby/gems/gitlab-dangerfiles-jh.git
-  revision: 4caaedcbf69a95efa82b54085824b29d3bb197aa
-  tag: v3.6.6-jh
+PATH
+  remote: ../gems/gitlab-schema-validation
   specs:
-    gitlab-dangerfiles-jh (3.6.6.pre.jh)
-      danger (>= 8.4.5)
-      danger-gitlab (>= 8.0.0)
-      rake
+    gitlab-schema-validation (0.1.0)
+      diffy
+      pg_query
+
+PATH
+  remote: ../gems/gitlab-utils
+  specs:
+    gitlab-utils (0.1.0)
+      actionview (>= 6.1.7.2)
+      activesupport (>= 6.1.7.2)
+      addressable (~> 2.8)
+      nokogiri (~> 1.15.2)
+      rake (~> 13.0)
+
+PATH
+  remote: ../gems/ipynbdiff
+  specs:
+    ipynbdiff (0.4.7)
+      diffy (~> 3.4)
+      oj (~> 3.13.16)
+
+PATH
+  remote: ../gems/rspec_flaky
+  specs:
+    rspec_flaky (0.1.0)
+      activesupport (>= 6.1, < 7.1)
+      rspec (~> 3.0)
 
 PATH
   remote: ../vendor/gems/attr_encrypted
@@ -113,78 +141,6 @@ PATH
       json (>= 2.5)
       sidekiq (~> 6.1)
 
-PATH
-  remote: ../gems/activerecord-gitlab
-  specs:
-    activerecord-gitlab (0.2.0)
-      activerecord (>= 7)
-
-PATH
-  remote: ../gems/click_house-client
-  specs:
-    click_house-client (0.1.0)
-      activesupport (< 8)
-      addressable (~> 2.8)
-      json (~> 2.6.3)
-
-PATH
-  remote: ../gems/error_tracking_open_api
-  specs:
-    error_tracking_open_api (1.0.0)
-      typhoeus (~> 1.0, >= 1.0.1)
-
-PATH
-  remote: ../gems/gitlab-rspec
-  specs:
-    gitlab-rspec (0.1.0)
-      activesupport (>= 6.1, < 7.1)
-      rspec (~> 3.0)
-
-PATH
-  remote: ../gems/gitlab-safe_request_store
-  specs:
-    gitlab-safe_request_store (0.1.0)
-      request_store
-
-PATH
-  remote: ../gems/gitlab-schema-validation
-  specs:
-    gitlab-schema-validation (0.1.0)
-      diffy
-      pg_query
-
-PATH
-  remote: ../gems/gitlab-utils
-  specs:
-    gitlab-utils (0.1.0)
-      actionview (>= 6.1.7.2)
-      activesupport (>= 6.1.7.2)
-      addressable (~> 2.8)
-      nokogiri (~> 1.15.2)
-      rake (~> 13.0)
-
-PATH
-  remote: ../gems/ipynbdiff
-  specs:
-    ipynbdiff (0.4.7)
-      diffy (~> 3.4)
-      oj (~> 3.13.16)
-
-PATH
-  remote: ../gems/rspec_flaky
-  specs:
-    rspec_flaky (0.1.0)
-      activesupport (>= 6.1, < 7.1)
-      rspec (~> 3.0)
-
-PATH
-  remote: vendor/gems/omniauth-cas3
-  specs:
-    omniauth-cas3 (1.1.4)
-      addressable (~> 2.3)
-      nokogiri (~> 1.7, >= 1.7.1)
-      omniauth (~> 2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -396,7 +352,6 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-utils (16.10.17)
-    chinese_pinyin (1.1.0)
     chunky_png (1.3.5)
     circuitbox (2.0.0)
     citrus (3.0.2)
@@ -1236,8 +1191,6 @@ GEM
     png_quantizator (0.2.1)
     po_to_json (1.0.1)
       json (>= 1.6.0)
-    posthog-ruby (1.3.0)
-      concurrent-ruby
     premailer (1.16.0)
       addressable
       css_parser (>= 1.6.0)
@@ -1798,7 +1751,6 @@ DEPENDENCIES
   capybara-screenshot (~> 1.0.26)
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.7)
-  chinese_pinyin (~> 1.1)
   circuitbox (= 2.0.0)
   click_house-client!
   cloud_profiler_agent (~> 0.0.0)!
@@ -1853,7 +1805,6 @@ DEPENDENCIES
   gitaly (~> 16.2.0.pre.rc4)
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 3.12.0)
-  gitlab-dangerfiles-jh!
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.8.0)
   gitlab-labkit (~> 0.33.0)
@@ -1957,7 +1908,6 @@ DEPENDENCIES
   omniauth-auth0 (~> 3.1)
   omniauth-azure-activedirectory-v2 (~> 2.0)
   omniauth-azure-oauth2 (~> 0.0.9)!
-  omniauth-cas3 (~> 1.1.4)!
   omniauth-dingtalk-oauth2 (~> 1.0)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (= 2.0.1)
@@ -1981,7 +1931,6 @@ DEPENDENCIES
   pg (~> 1.5.3)
   pg_query (~> 4.2.1)
   png_quantizator (~> 0.2.1)
-  posthog-ruby (= 1.3.0)
   premailer-rails (~> 1.10.3)
   prometheus-client-mmap (~> 0.27)
   pry-byebug
@@ -2059,9 +2008,6 @@ DEPENDENCIES
   sys-filesystem (~> 1.4.3)
   tanuki_emoji (~> 0.6)
   telesignenterprise (~> 2.2)
-  tencentcloud-sdk-captcha!
-  tencentcloud-sdk-common!
-  tencentcloud-sdk-sms!
   terser (= 1.0.2)
   test-prof (~> 1.2.2)
   test_file_finder (~> 0.1.3)

2.diff

diff --git a/jh/Gemfile.lock b/jh/Gemfile.lock
index 279c5bc9c085..3d654cffefb6 100644
--- a/jh/Gemfile.lock
+++ b/jh/Gemfile.lock
@@ -34,6 +34,70 @@ GIT
       danger-gitlab (>= 8.0.0)
       rake
 
+PATH
+  remote: ../gems/activerecord-gitlab
+  specs:
+    activerecord-gitlab (0.2.0)
+      activerecord (>= 7)
+
+PATH
+  remote: ../gems/click_house-client
+  specs:
+    click_house-client (0.1.0)
+      activesupport (< 8)
+      addressable (~> 2.8)
+      json (~> 2.6.3)
+
+PATH
+  remote: ../gems/error_tracking_open_api
+  specs:
+    error_tracking_open_api (1.0.0)
+      typhoeus (~> 1.0, >= 1.0.1)
+
+PATH
+  remote: ../gems/gitlab-rspec
+  specs:
+    gitlab-rspec (0.1.0)
+      activesupport (>= 6.1, < 7.1)
+      rspec (~> 3.0)
+
+PATH
+  remote: ../gems/gitlab-safe_request_store
+  specs:
+    gitlab-safe_request_store (0.1.0)
+      request_store
+
+PATH
+  remote: ../gems/gitlab-schema-validation
+  specs:
+    gitlab-schema-validation (0.1.0)
+      diffy
+      pg_query
+
+PATH
+  remote: ../gems/gitlab-utils
+  specs:
+    gitlab-utils (0.1.0)
+      actionview (>= 6.1.7.2)
+      activesupport (>= 6.1.7.2)
+      addressable (~> 2.8)
+      nokogiri (~> 1.15.2)
+      rake (~> 13.0)
+
+PATH
+  remote: ../gems/ipynbdiff
+  specs:
+    ipynbdiff (0.4.7)
+      diffy (~> 3.4)
+      oj (~> 3.13.16)
+
+PATH
+  remote: ../gems/rspec_flaky
+  specs:
+    rspec_flaky (0.1.0)
+      activesupport (>= 6.1, < 7.1)
+      rspec (~> 3.0)
+
 PATH
   remote: ../vendor/gems/attr_encrypted
   specs:
@@ -113,70 +177,6 @@ PATH
       json (>= 2.5)
       sidekiq (~> 6.1)
 
-PATH
-  remote: ../gems/activerecord-gitlab
-  specs:
-    activerecord-gitlab (0.2.0)
-      activerecord (>= 7)
-
-PATH
-  remote: ../gems/click_house-client
-  specs:
-    click_house-client (0.1.0)
-      activesupport (< 8)
-      addressable (~> 2.8)
-      json (~> 2.6.3)
-
-PATH
-  remote: ../gems/error_tracking_open_api
-  specs:
-    error_tracking_open_api (1.0.0)
-      typhoeus (~> 1.0, >= 1.0.1)
-
-PATH
-  remote: ../gems/gitlab-rspec
-  specs:
-    gitlab-rspec (0.1.0)
-      activesupport (>= 6.1, < 7.1)
-      rspec (~> 3.0)
-
-PATH
-  remote: ../gems/gitlab-safe_request_store
-  specs:
-    gitlab-safe_request_store (0.1.0)
-      request_store
-
-PATH
-  remote: ../gems/gitlab-schema-validation
-  specs:
-    gitlab-schema-validation (0.1.0)
-      diffy
-      pg_query
-
-PATH
-  remote: ../gems/gitlab-utils
-  specs:
-    gitlab-utils (0.1.0)
-      actionview (>= 6.1.7.2)
-      activesupport (>= 6.1.7.2)
-      addressable (~> 2.8)
-      nokogiri (~> 1.15.2)
-      rake (~> 13.0)
-
-PATH
-  remote: ../gems/ipynbdiff
-  specs:
-    ipynbdiff (0.4.7)
-      diffy (~> 3.4)
-      oj (~> 3.13.16)
-
-PATH
-  remote: ../gems/rspec_flaky
-  specs:
-    rspec_flaky (0.1.0)
-      activesupport (>= 6.1, < 7.1)
-      rspec (~> 3.0)
-
 PATH
   remote: vendor/gems/omniauth-cas3
   specs:

After executing the commands, nothing will be modified (The content has not been modified, the order may change).

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

I have evaluated the MR acceptance checklist for this MR.

由 Baodong 编辑于 8月 02, 2023

Adjust JH Gemfile.lock

What does this MR do and why?

Screenshots or screen recordings

How to set up and validate locally

MR acceptance checklist

合并请求报告