Sync with upstream v306 #109
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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>
Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
* Fix `cp` update none on Heroku 20 In heroku#1583 a warning was bypassed by switching from `-n` to `--update none`. Unfortunately this triggers an error with the version of `cp` on `heroku-20` (which is EOL in 2 days) due to not having that flag: ``` -----> Preparing app for Rails asset pipeline remote: cp: option '--update' doesn't allow an argument remote: Try 'cp --help' for more information. ``` Internal ticket link https://heroku.support/1570694. * Check exit status of copy command * Changelog
Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
* Assert no warnings from `cp`
* Fix cache warning on heroku-22
Before:
```
$ be rspec spec/hatchet/getting_started_spec.rb:25
Run options: include {:focused=>true, :locations=>{"./spec/hatchet/getting_started_spec.rb"=>[25]}}
Hatchet setup: "hatchet-t-91c5d5b6ce" for "ruby-getting-started"
Destroying "hatchet-t-91c5d5b6ce": eb7dab2f-d12a-4bd2-b62a-c48781aa55a9, (0/20) reason: teardown
F
Failures:
1) Heroku ruby getting started works on Heroku-22
Failure/Error: expect(app.output).to_not include("cp --help")
```
After:
```
$ be rspec spec/hatchet/getting_started_spec.rb:25
Run options: include {:focused=>true, :locations=>{"./spec/hatchet/getting_started_spec.rb"=>[25]}}
Hatchet setup: "hatchet-t-17874ceca3" for "ruby-getting-started"
Finished in 2 minutes 21.4 seconds (files took 0.1802 seconds to load)
1 example, 0 failures
```
Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
Co-authored-by: heroku-linguist[bot] <136119646+heroku-linguist[bot]@users.noreply.github.com>
sc-david-voisin
approved these changes
May 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #108