A platform for community discussion. Free, open, simple.
DEV: Update bundler from 2.6.4 to 4.0.11 (#40441)
Jarek Radosz6ad878c973a2
diff --git a/Gemfile b/Gemfileindex 771a093ce31..070edea23d1 100644--- a/Gemfile+++ b/Gemfile@@ -227,9 +227,7 @@ gem "rqrcode"gem "rubyzip", require: false-install_if -> { RUBY_PLATFORM.include?("linux") } do- gem "landlock", require: false-end+gem "landlock", require: falsegem "sshkey", require: falsediff --git a/Gemfile.lock b/Gemfile.lockindex 3578a2d01e9..6f3e8750d98 100644--- a/Gemfile.lock+++ b/Gemfile.lock@@ -183,8 +183,6 @@ GEMfastimage (2.4.1)ffi (1.17.4-aarch64-linux-gnu)ffi (1.17.4-aarch64-linux-musl)- ffi (1.17.4-arm-linux-gnu)- ffi (1.17.4-arm-linux-musl)ffi (1.17.4-arm64-darwin)ffi (1.17.4-x86_64-darwin)ffi (1.17.4-x86_64-linux-gnu)@@ -195,9 +193,6 @@ GEMgoldiloader (6.0.0)activerecord (>= 7.2, < 8.3)activesupport (>= 7.2, < 8.3)- google-protobuf (4.34.1)- bigdecimal- rake (~> 13.3)google-protobuf (4.34.1-aarch64-linux-gnu)bigdecimalrake (~> 13.3)@@ -258,7 +253,6 @@ GEMbase64landlock (0.2)language_server-protocol (3.17.0.5)- libv8-node (24.12.0.1)libv8-node (24.12.0.1-aarch64-linux)libv8-node (24.12.0.1-aarch64-linux-musl)libv8-node (24.12.0.1-arm64-darwin)@@ -338,10 +332,6 @@ GEMracc (~> 1.4)nokogiri (1.19.3-aarch64-linux-musl)racc (~> 1.4)- nokogiri (1.19.3-arm-linux-gnu)- racc (~> 1.4)- nokogiri (1.19.3-arm-linux-musl)- racc (~> 1.4)nokogiri (1.19.3-arm64-darwin)racc (~> 1.4)nokogiri (1.19.3-x86_64-darwin)@@ -413,7 +403,6 @@ GEMhashery (~> 2.0)ruby-rc4ttfunk- pg (1.6.3)pg (1.6.3-aarch64-linux)pg (1.6.3-aarch64-linux-musl)pg (1.6.3-arm64-darwin)@@ -489,12 +478,9 @@ GEMrainbow (3.1.1)raindrops (0.20.1)rake (13.4.2)- rake-compiler-dock (1.12.0)rb-fsevent (0.11.2)rb-inotify (0.11.1)ffi (~> 1.0)- rb_sys (0.9.128)- rake-compiler-dock (= 1.12.0)rbs (4.0.2)loggerprism (>= 1.6.0)@@ -634,10 +620,6 @@ GEMgoogle-protobuf (~> 4.31)sass-embedded (1.99.0-aarch64-linux-musl)google-protobuf (~> 4.31)- sass-embedded (1.99.0-arm-linux-gnueabihf)- google-protobuf (~> 4.31)- sass-embedded (1.99.0-arm-linux-musleabihf)- google-protobuf (~> 4.31)sass-embedded (1.99.0-arm64-darwin)google-protobuf (~> 4.31)sass-embedded (1.99.0-x86_64-darwin)@@ -672,8 +654,6 @@ GEMversion_gem (>= 1.1.8, < 3)sqlite3 (2.9.3-aarch64-linux-gnu)sqlite3 (2.9.3-aarch64-linux-musl)- sqlite3 (2.9.3-arm-linux-gnu)- sqlite3 (2.9.3-arm-linux-musl)sqlite3 (2.9.3-arm64-darwin)sqlite3 (2.9.3-x86_64-darwin)sqlite3 (2.9.3-x86_64-linux-gnu)@@ -688,14 +668,11 @@ GEMthor (1.5.0)tiktoken_ruby (0.0.16-aarch64-linux)tiktoken_ruby (0.0.16-aarch64-linux-musl)- tiktoken_ruby (0.0.16-arm-linux)tiktoken_ruby (0.0.16-arm64-darwin)tiktoken_ruby (0.0.16-x86_64-darwin)tiktoken_ruby (0.0.16-x86_64-linux)tiktoken_ruby (0.0.16-x86_64-linux-musl)timeout (0.6.1)- tokenizers (0.6.4)- rb_systokenizers (0.6.4-aarch64-linux)tokenizers (0.6.4-aarch64-linux-musl)tokenizers (0.6.4-arm64-darwin)@@ -755,11 +732,6 @@ PLATFORMSaarch64-linuxaarch64-linux-gnuaarch64-linux-musl- arm-linux- arm-linux-gnu- arm-linux-gnueabihf- arm-linux-musl- arm-linux-musleabihfarm64-darwinx86_64-darwinx86_64-linux@@ -966,6 +938,7 @@ CHECKSUMSbootsnap (1.24.3) sha256=f7fa3d20597e2f0aa52b0a1aba83fb54d4f79e9c2e210ec4fa1e8895514dcad8builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835fbullet (8.1.1) sha256=3ddecdf3787c64a3f1e5b316256840bc034d60c1070b1b16d3fe5b5932d42b87+ bundler (4.0.11) sha256=5bcec0fb78302e48d02ee46f10ee6e6942be647ba5b44a6d1ddfda9a240ce785capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeefcapybara-playwright-driver (0.5.9) sha256=4c17fed20817b7e1bde2cfc8186e7bf5cd72017ce1aa695e35130f8e600e7282cbor (0.5.10.2) sha256=df5104f7a62c881123e6505441b1e276208be1771540c2cc3b1de8a210a7c52c@@ -1014,8 +987,6 @@ CHECKSUMSfastimage (2.4.1) sha256=c64bebd46b6fd8943ab70c1e6e85ff728f970f2e48f92ecd249b6bc3a540ad20ffi (1.17.4-aarch64-linux-gnu) sha256=b208f06f91ffd8f5e1193da3cae3d2ccfc27fc36fba577baf698d26d91c080dfffi (1.17.4-aarch64-linux-musl) sha256=9286b7a615f2676245283aef0a0a3b475ae3aae2bb5448baace630bb77b91f39- ffi (1.17.4-arm-linux-gnu) sha256=d6dbddf7cb77bf955411af5f187a65b8cd378cb003c15c05697f5feee1cb1564- ffi (1.17.4-arm-linux-musl) sha256=9d4838ded0465bef6e2426935f6bcc93134b6616785a84ffd2a3d82bc3cf6f95ffi (1.17.4-arm64-darwin) sha256=19071aaf1419251b0a46852abf960e77330a3b334d13a4ab51d58b31a937001bffi (1.17.4-x86_64-darwin) sha256=aa70390523cf3235096cf64962b709b4cfbd5c082a2cb2ae714eb0fe2ccda496ffi (1.17.4-x86_64-linux-gnu) sha256=9d3db14c2eae074b382fa9c083fe95aec6e0a1451da249eab096c34002bc752d@@ -1023,7 +994,6 @@ CHECKSUMSfspath (3.1.2) sha256=b5ac9bafb97e2c8f8f9e303cd98ebd484be76fe9aa588bc4d01c6d99e78c9d75globalid (1.3.0) sha256=05c639ad6eb4594522a0b07983022f04aa7254626ab69445a0e493aa3786ff11goldiloader (6.0.0) sha256=613db1b28e9964291255a67a521f04d481b6afd6b9ca56ea1a612fd86e9a89c7- google-protobuf (4.34.1) sha256=347181542b8d659c60f028fa3791c9cccce651a91ad27782dbc5c5e374796cdcgoogle-protobuf (4.34.1-aarch64-linux-gnu) sha256=f9c07607dc139c895f2792a7740fcd01cd94d4d7b0e0a939045b50d7999f0b1dgoogle-protobuf (4.34.1-aarch64-linux-musl) sha256=db58e5a4a492b43c6614486aea31b7fb86955b175d1d48f28ebf388f058d78a9google-protobuf (4.34.1-arm64-darwin) sha256=2745061f973119e6e7f3c81a0c77025d291a3caa6585a2cd24a25bbc7bedb267@@ -1053,7 +1023,6 @@ CHECKSUMSjwt (2.10.1) sha256=e6424ae1d813f63e761a04d6284e10e7ec531d6f701917fadcd0d9b2deaf1cc5landlock (0.2) sha256=9bb86d7d12b16485b278ba575d49f55b730089c7a3d0f45a769fe4d7384d5e55language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc- libv8-node (24.12.0.1) sha256=d93d23b861bfe5de3ba829e34a142402fb83b4c3592dd58d9ac4e027588d739alibv8-node (24.12.0.1-aarch64-linux) sha256=22bd0246cde85d70c88cf772727ac3677a20ac1d169105f82efe5f1f7c39f755libv8-node (24.12.0.1-aarch64-linux-musl) sha256=791b5960f79525e87d1bd1e5f2bf3715ef2a38bac6c97f297853e98a8411ba89libv8-node (24.12.0.1-arm64-darwin) sha256=124904a46b4a15c01ac024b4cf537dcf199cfb49a309cc59f66315e156e48339@@ -1100,8 +1069,6 @@ CHECKSUMSnio4r (2.7.5) sha256=6c90168e48fb5f8e768419c93abb94ba2b892a1d0602cb06eef16d8b7df1dca1nokogiri (1.19.3-aarch64-linux-gnu) sha256=46b89e5d7b9e844c2ee360794240c6ea2a4e6fa0c5892a4ed487db621224b639nokogiri (1.19.3-aarch64-linux-musl) sha256=8392dfdcd21be7a94dbbe9ccc138dea01b97b24cb2dc02a114ca98bfb1d9a0b7- nokogiri (1.19.3-arm-linux-gnu) sha256=3919d5ffc334ad778a4a9eb88fda7dcb8b1fb58c8a52ac640c6dcd2f038e774f- nokogiri (1.19.3-arm-linux-musl) sha256=9ce1cb6346bb9c67b1550eb537aa183ead91e4b6eadb2f36ade02d8dd2a79fb6nokogiri (1.19.3-arm64-darwin) sha256=71b9bd424b1b7abc18b05052a1a3cfd3627abdca62be280854cc411791357e42nokogiri (1.19.3-x86_64-darwin) sha256=77f3fba57d46c53ab31e62fc6c28f705109d1bf6264356c76f132b2be5728d4dnokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976@@ -1127,7 +1094,6 @@ CHECKSUMSparser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54pastel (0.8.0) sha256=481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75pdf-reader (2.15.1) sha256=18c6a986a84a3117fa49f4279fc2de51f5d2399b71833df5d2bccd595c7068ce- pg (1.6.3) sha256=1388d0563e13d2758c1089e35e973a3249e955c659592d10e5b77c468f628a99pg (1.6.3-aarch64-linux) sha256=0698ad563e02383c27510b76bf7d4cd2de19cd1d16a5013f375dd473e4be72eapg (1.6.3-aarch64-linux-musl) sha256=06a75f4ea04b05140146f2a10550b8e0d9f006a79cdaf8b5b130cde40e3ecc2cpg (1.6.3-arm64-darwin) sha256=7240330b572e6355d7c75a7de535edb5dfcbd6295d9c7777df4d9dddfb8c0e5f@@ -1162,10 +1128,8 @@ CHECKSUMSrainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6araindrops (0.20.1) sha256=aa0eb9ff6834f2d9e232ba688bd49cb30be893bc5a3452e74722c94c1fab4730rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701- rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aeferb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e- rb_sys (0.9.128) sha256=9ab81f4d6d4e1895de18762232362d1264475aa7035756b50441e442130538fdrbs (4.0.2) sha256=af75671e66cd03434cc546622741ebf83f6197ec4328375805306330bf78ef25rbtrace (0.5.3) sha256=c432292f305d9ab12fd47d9722e0d5210d983758a951fe6107c36cc955cb923frchardet (1.10.0) sha256=d5ea2ed61a720a220f1914778208e718a0c7ed2a484b6d357ba695aa7001390f@@ -1216,8 +1180,6 @@ CHECKSUMSsanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984sass-embedded (1.99.0-aarch64-linux-gnu) sha256=a46615b0295ca7bd979b9ce79f6b9f1d26881736400188bd6fd5c4b7c9b46473sass-embedded (1.99.0-aarch64-linux-musl) sha256=eaa6d56968909d1d54073c46e21c13fd5bbcb5af609d7e4fbe6b196426ca8e49- sass-embedded (1.99.0-arm-linux-gnueabihf) sha256=f5f0748934660cda6948917af6dc974caf4d36ea6121e450982153b7d9c49b55- sass-embedded (1.99.0-arm-linux-musleabihf) sha256=29a4056e76bc136025ba5d03e82d86ecdabfb6c07a473a4fdedcd72fb28dbbc4sass-embedded (1.99.0-arm64-darwin) sha256=20773f2fb0e8f4d0194eb1874dab4c0ef60262ff6dafe29361e217beb2208629sass-embedded (1.99.0-x86_64-darwin) sha256=371774c83b6dce8a2cb7b5ce5a0f918ff2735bf200b00e3bc7067366654fff13sass-embedded (1.99.0-x86_64-linux-gnu) sha256=a4e2ae5e9951815cb8b3ab408cee8b800852491988a57de735f18d259c70d7c4@@ -1234,8 +1196,6 @@ CHECKSUMSsnaky_hash (2.0.3) sha256=25a3d299566e8153fb02fa23fd9a9358845950f7a523ddbbe1fa1e0d79a6d456sqlite3 (2.9.3-aarch64-linux-gnu) sha256=ca6dd1cf6c037ccc8d3e5837190cc61ef15466092014951235641b5c4c8ab4eesqlite3 (2.9.3-aarch64-linux-musl) sha256=ff017a36c463d02e9f0be7a6224521371128024e6a05ed16994afa5c037afbba- sqlite3 (2.9.3-arm-linux-gnu) sha256=fd8b74337a66bdaf746b97d65e6c9a2faff803c8f72d6b107fb880972815d072- sqlite3 (2.9.3-arm-linux-musl) sha256=792ae9a786bb37dbdc4c443c527bc91df423aac10e472f76d5cf5a9ac6d51980sqlite3 (2.9.3-arm64-darwin) sha256=76b265d3d57362d3e38338f24f50a0c9cd47a4599c9cfbb578fac125d2299906sqlite3 (2.9.3-x86_64-darwin) sha256=087e7cc4efc73d83e76354f028c4d1dc14552a05acc74f60e77a55f1bee6ef22sqlite3 (2.9.3-x86_64-linux-gnu) sha256=85200a10c6cf5c60085fcca411a3168c5fba8fda3e2b1b0109ec277d7c226d46@@ -1249,13 +1209,11 @@ CHECKSUMSthor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73tiktoken_ruby (0.0.16-aarch64-linux) sha256=014e5ba44b99158916ff57db61d2cb3fdbc6d176644d3f6bbf36a7d36ef9467dtiktoken_ruby (0.0.16-aarch64-linux-musl) sha256=0519bb7eed1ebe0202c302103e9edf8754e4ea3029f63573c0d0a24649f701aa- tiktoken_ruby (0.0.16-arm-linux) sha256=bce44f0e1882631748e59223be7cc529fe891304b7a044e58bc8f9bb3d56dd14tiktoken_ruby (0.0.16-arm64-darwin) sha256=3da6fe850bf920d08c7eb736673f50bc9d08e8f2e17d34904ad3185a73fc9da7tiktoken_ruby (0.0.16-x86_64-darwin) sha256=4776d9f6d2f00ec4386260f3ef379347fd2dc375361c750fef7e96b57364c5betiktoken_ruby (0.0.16-x86_64-linux) sha256=4d970b8e68a86972ec81799306116480b33a558c06bb4fe0092852280a4b76b2tiktoken_ruby (0.0.16-x86_64-linux-musl) sha256=6a0400a7aba9da6146b30af5d7e4375167c5e5a291853ce47768985916c4d183timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb- tokenizers (0.6.4) sha256=7881f2afee7e605dec6be0c382d4bd138622b77263a67ca66f4ef3156e8e8f47tokenizers (0.6.4-aarch64-linux) sha256=4898a86c726106967a929a318ffaacb7fa99a6cba5b50e3957f80151c0d7789atokenizers (0.6.4-aarch64-linux-musl) sha256=351428bcf096c931666ee148d23b875b0e519749a57a5d2984e319af11ea791ftokenizers (0.6.4-arm64-darwin) sha256=ab123cb46e8df7e118bee0833d0bc21d4004a0d39816c0def56503be59de26c3@@ -1290,7 +1248,7 @@ CHECKSUMSzendesk_api (1.38.0.rc1) sha256=9ebe2575d223ed1c0651b2d10df6c010141cda49d524c38532b472f7e8bb3f7aRUBY VERSION- ruby 3.4.7p58+ ruby 3.4.7p58BUNDLED WITH- 2.6.4+ 4.0.11diff --git a/bin/annotaterb b/bin/annotaterbindex 3152f2f83bf..b8ece5335ca 100755--- a/bin/annotaterb+++ b/bin/annotaterb@@ -10,19 +10,6 @@ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)-bundle_binstub = File.expand_path("bundle", __dir__)--if File.file?(bundle_binstub)- if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")- load(bundle_binstub)- else- abort(- "Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.",- )- end-end-require "rubygems"require "bundler/setup"diff --git a/bin/rubocop b/bin/rubocopindex cb690b3558b..d73598dc228 100755--- a/bin/rubocop+++ b/bin/rubocop@@ -8,21 +8,7 @@# this file is here to facilitate running it.#-require "pathname"-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)--bundle_binstub = File.expand_path("../bundle", __FILE__)--if File.file?(bundle_binstub)- if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/- load(bundle_binstub)- else- abort(- "Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.",- )- end-end+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)require "rubygems"require "bundler/setup"