Skip to content

Commit 6d1a673

Browse files
schneemsJanNash
andauthored
Use --update=none instead of -n for copy in cache.rb (heroku#1583)
* Use `--update=none` instead of `-n` for `copy` in `cache.rb` * Changelog * Fix CI failure ``` 1) LanguagePack::Helpers::OutdatedRubyVersion handles arm 💪 architecture on heroku-24 Failure/Error: expect(outdated.suggested_ruby_minor_version).to eq("3.3.7") expected: "3.3.7" got: "3.3.8" (compared using ==) # ./vendor/bundle/ruby/3.1.0/gems/rspec-support-3.13.1/lib/rspec/support.rb:110:in `block in <module:Support>' ``` 3.1 is EOL now and shouldn't change. We should use that. --------- Co-authored-by: Jan Nash <jnash@jnash.de>
1 parent 31f816d commit 6d1a673

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [Unreleased]
44

5+
- Fix warning message about `cp -n` (https://github.com/heroku/heroku-buildpack-ruby/pull/1583)
56

67
## [v302] - 2025-04-16
78

lib/language_pack/cache.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def load_without_overwrite(path, dest=nil)
5858
return unless @cache_base
5959

6060
dest ||= path
61-
copy (@cache_base + path), dest, '-a -n'
61+
copy (@cache_base + path), dest, '-a --update=none'
6262
end
6363

6464
# copy cache contents

spec/helpers/outdated_ruby_version_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
end
2424

2525
it "handles arm 💪 architecture on heroku-24" do
26-
ruby_version = LanguagePack::RubyVersion.new("ruby-3.3.0")
26+
ruby_version = LanguagePack::RubyVersion.new("ruby-3.1.0")
2727
fetcher = LanguagePack::Fetcher.new(
2828
LanguagePack::Base::VENDOR_URL,
2929
stack: "heroku-24",
@@ -35,7 +35,7 @@
3535
)
3636

3737
outdated.call
38-
expect(outdated.suggested_ruby_minor_version).to eq("3.3.7")
38+
expect(outdated.suggested_ruby_minor_version).to eq("3.1.7")
3939
end
4040

4141
it "finds the latest version on a stack" do

0 commit comments

Comments
 (0)