Skip to content

Commit 404cd18

Browse files
committed
cocina-level2-updates: remove --conservative from bundle update
1 parent 48bbbe5 commit 404cd18

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

cocina_level2_prs.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ def create_branch
7676
def update_gems
7777
gemfile = File.read('Gemfile')
7878
included_gems = %w[cocina-models dor-services-client sdr-client dor_indexing].filter { |gem_name| gemfile.include?(gem_name)}
79-
ErrorEmittingExecutor.execute("bundle update --conservative #{included_gems.join(' ')}") unless included_gems.empty?
79+
# NOTE: --conservative flag can be too aggressive in avoiding updates to dependencies of OUR gems
80+
# e.g. diff-lcs is a tertiary dependency of dor-services-client, so dsc would not be updated
81+
# ErrorEmittingExecutor.execute("bundle update --conservative #{included_gems.join(' ')}") unless included_gems.empty?
82+
# NOTE: NOT using --conservative flag can mean gems we don't want to update get updated (e.g. rails)
83+
ErrorEmittingExecutor.execute("bundle update #{included_gems.join(' ')}") unless included_gems.empty?
8084
end
8185

8286
# must be called as part of the block for within_cloned_repo_dir(repo)

0 commit comments

Comments
 (0)