Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock Sprockets to v3.x #3378

Merged

Conversation

spaghetticode
Copy link
Member

@spaghetticode spaghetticode commented Oct 11, 2019

Description

Ref #3374

This is a temporary fix that will allow master to be green again (so we can continue working on PRs) while we wait for rails/sprockets-rails#446 to be merged (or some other working solution).

Checklist:

@spaghetticode spaghetticode self-assigned this Oct 11, 2019
@spaghetticode spaghetticode force-pushed the spaghetticode/lock-sprockets branch 2 times, most recently from 3143a1b to b4c7500 Compare October 11, 2019 09:22
@spaghetticode spaghetticode changed the title Lock Sprockets to v3.x Lock Sprockets to v3.x on circleCI Oct 11, 2019
Gemfile Outdated
@@ -8,6 +8,13 @@ group :backend, :frontend, :core, :api do
rails_version = ENV['RAILS_VERSION'] || '~> 6.0.0'
gem 'rails', rails_version, require: false

if ENV['CIRCLE_TEST_REPORTS']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious about CIRCLE_TEST_REPORTS var: why not using one of the built-in env flags: https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables ? 🤔(CI or CIRCLECI, both booleans).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know exactly what env variables were set in circleCi by default, so I went with one that's explicitly set in the file circle.yml

After looking at the list I think the best candidate is CI, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree 👍 I usually see ENV['CI'] used in these cases

@kennyadsl
Copy link
Member

@spaghetticode I'd lock it anyway (not on CI only), we have this failure even running tests locally and on extensions due to this issue.

@spaghetticode
Copy link
Member Author

spaghetticode commented Oct 11, 2019

@kennyadsl locally one can use CI=true bundle exec rake, while (most of) extensions use circleCI already, so I guess the problem may be minimal. I was trying to avoid possible issues to people already on Sprockets 4, but maybe scenario actually does not exist 🤔
Also, consistency is a valuable thing, so I'm chaging this to lock the gem everywhere. If somebody shows some concerns then I can change it again before merging.

@spaghetticode spaghetticode changed the title Lock Sprockets to v3.x on circleCI Lock Sprockets to v3.x Oct 11, 2019
Copy link
Member

@kennyadsl kennyadsl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, Andrea!

@kennyadsl
Copy link
Member

@spaghetticode can you please rebase against upstream master to have Rails 5.1 specs out of the required checks?

@spaghetticode
Copy link
Member Author

@kennyadsl it's already updated. I removed the requirements for Rails 5.1 branches by updating github configuration. PR is now ready to merge.

Schermata 2019-10-11 alle 14 37 48

@spaghetticode spaghetticode merged commit f80912a into solidusio:master Oct 11, 2019
@spaghetticode spaghetticode deleted the spaghetticode/lock-sprockets branch October 11, 2019 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants