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.

Sign up for GitHub

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

Jump to bottom

Restrict sqlite3 gem to '~> 1.3', like ActiveRecord #5727

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Restrict sqlite3 gem to '~> 1.3', like ActiveRecord #5727

merged 2 commits into from
Apr 18, 2024
+3 −1

Conversation

mamhoff
Copy link
Contributor

@mamhoff mamhoff commented Apr 17, 2024

They just released sqlite3 2.0.0, but ActiveRecord's sqlite3 adapter doesn't know about this yet, leading to conflicting sqlite3 gems in specs.

This is probably a temporary fix until ActiveRecord learns the news.

See https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14
and https://github.com/sparklemotion/sqlite3-ruby/blob/main/CHANGELOG.md

@mamhoff
Restrict sqlite3 gem to '~> 1.3', like ActiveRecord
4319e17 
They just released sqlite3 2.0.0, but ActiveRecord's sqlite3 adapter
doesn't know about this yet, leading to conflicting sqlite3 gems in
specs.

This is probably a temporary fix until ActiveRecord learns the news.
@mamhoff mamhoff requested a review from a team as a code owner April 17, 2024 19:55
@github-actions github-actions bot added the changelog:repository Changes to the repository not within any gem label Apr 17, 2024
tvdeyen
tvdeyen reviewed Apr 18, 2024
View reviewed changes
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

installer specs are failing. can't see why right now. mind looking into it?

@tvdeyen
Copy link
Member

tvdeyen commented Apr 18, 2024

@mamhoff installer seems to need the same restriction

Generating dummy Rails application...
create config/master.key
FRONTEND=none bin/rails generate solidus:install /tmp/dummy_extension/spec/dummy --auto-accept --admin-preview=false --authentication=none --payment-method=none --migrate=false --seed=false --sample=false --user-class=Spree::LegacyUser --quiet
rake aborted!
LoadError: Error loading the 'sqlite3' Active Record adapter. Missing a gem it depends on? can't activate sqlite3 (~> 1.4), already activated sqlite3-2.0.0-x86_64-linux-gnu. Make sure all dependencies are added to Gemfile.

@mamhoff mamhoff force-pushed the restrict-sqlite-to-1.x branch 4 times, most recently from a67ec28 to 190bab4 Compare April 18, 2024 09:59
@mamhoff
Restrict sqlite3 for the extension generator
e85fd4c 
The task itself is fine, as it inherits from
Rails' app generator, which has the sqlite3 restriction:
https://github.com/rails/rails/blob/main/railties/lib/rails/generators/database.rb#L19.
@mamhoff mamhoff force-pushed the restrict-sqlite-to-1.x branch from 190bab4 to e85fd4c Compare April 18, 2024 10:12
@codecov Codecov
Copy link

codecov bot commented Apr 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.84%. Comparing base (3f6c58c) to head (e85fd4c).
Report is 2 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #5727   +/-   ##
=======================================
  Coverage   88.84%   88.84%           
=======================================
  Files         704      704           
  Lines       16757    16757           
=======================================
  Hits        14887    14887           
  Misses       1870     1870

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

kennyadsl
kennyadsl approved these changes Apr 18, 2024
View reviewed changes
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.

👍

@mamhoff mamhoff mentioned this pull request Apr 18, 2024
Merged
3 tasks
@kennyadsl kennyadsl merged commit 7ba0f98 into solidusio:main Apr 18, 2024
14 checks passed
@tvdeyen tvdeyen added backport-v4.0 Backport this pull-request to v4.0 backport-v4.1 Backport this pull-request to v4.1 backport-v4.2 Backport this pull-request to v4.2 backport-v4.3 Backport this pull-request to v4.3 labels May 8, 2024
@github-actions github-actions bot mentioned this pull request May 8, 2024
Merged
@tvdeyen
Copy link
Member

tvdeyen commented May 8, 2024

need to backport or all backport prs will fail

@github-actions GitHub Actions
Copy link

github-actions bot commented May 8, 2024

💔 Some backports could not be created

Status Branch Result
❌ v4.0 Backport failed because of merge conflicts
❌ v4.1 Backport failed because of merge conflicts
✅ v4.2
❌ v4.3 An unhandled error occurred. Please see the logs for details

Manual backport

To create the backport manually run:

backport --pr 5727

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@github-actions github-actions bot mentioned this pull request May 8, 2024
Merged
@github-actions GitHub Actions
Copy link

github-actions bot commented May 8, 2024

💔 Some backports could not be created

Status Branch Result
❌ v4.0 Backport failed because of merge conflicts
❌ v4.1 Backport failed because of merge conflicts
✅ v4.2
✅ v4.3

Manual backport

To create the backport manually run:

backport --pr 5727

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@github-actions GitHub Actions
Copy link

github-actions bot commented May 8, 2024

💔 Some backports could not be created

Status Branch Result
❌ v4.0 Backport failed because of merge conflicts
❌ v4.1 Backport failed because of merge conflicts
✅ v4.2
✅ v4.3

Manual backport

To create the backport manually run:

backport --pr 5727

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@github-actions GitHub Actions
Copy link

github-actions bot commented May 8, 2024

💔 Some backports could not be created

Status Branch Result
❌ v4.0 Backport failed because of merge conflicts
❌ v4.1 Backport failed because of merge conflicts
✅ v4.2
✅ v4.3

Manual backport

To create the backport manually run:

backport --pr 5727

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@tvdeyen tvdeyen mentioned this pull request Dec 2, 2024
Merged
@tvdeyen
Copy link
Member

tvdeyen commented Dec 2, 2024

💚 All backports created successfully

Status Branch Result
✅ v4.0

Questions ?

Please refer to the Backport tool documentation

@tvdeyen tvdeyen mentioned this pull request Dec 2, 2024
Merged
@tvdeyen
Copy link
Member

tvdeyen commented Dec 2, 2024

💚 All backports created successfully

Status Branch Result
✅ v4.1

Questions ?

Please refer to the Backport tool documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tvdeyen tvdeyen tvdeyen left review comments

@adammathys adammathys adammathys approved these changes

@kennyadsl kennyadsl kennyadsl approved these changes

Assignees
No one assigned
Labels
backport-v4.0 Backport this pull-request to v4.0 backport-v4.1 Backport this pull-request to v4.1 backport-v4.2 Backport this pull-request to v4.2 backport-v4.3 Backport this pull-request to v4.3 changelog:repository Changes to the repository not within any gem
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mamhoff @tvdeyen @kennyadsl @adammathys