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

Restore Puma & SQLite dependency to correct state #6082

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

fthobe
Copy link
Contributor

@fthobe fthobe commented Jan 19, 2025

Summary

Fixes two dependency pinnings:

  1. Due to changes in Puma Capybara failed. The solution was to pin Puma to the development branch. Given that the issue has been resolved, I restored the gemfile to a stable puma release.

  2. original reason to pin sqlite:

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.

Issue has been solved in the meantime.

Fixes #6081

Checklist

Check out our PR guidelines for more details.

The following are mandatory for all PRs:

The following are not always needed:

  • 📖 I have updated the README to account for my changes.
  • 📑 I have documented new code with YARD.
  • 🛣️ I have opened a PR to update the guides.
  • ✅ I have added automated tests to cover my changes.
  • 📸 I have attached screenshots to demo visual changes.

The issue with capybara that originally caused the change to the main branch of the puma repo has been fixed and solidus should return on the Puma release cycle.
@fthobe fthobe requested a review from a team as a code owner January 19, 2025 18:46
@github-actions github-actions bot added the changelog:repository Changes to the repository not within any gem label Jan 19, 2025
Copy link

codecov bot commented Jan 19, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.58%. Comparing base (3675af2) to head (250a921).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6082      +/-   ##
==========================================
+ Coverage   89.33%   89.58%   +0.24%     
==========================================
  Files         730      801      +71     
  Lines       16462    18275    +1813     
==========================================
+ Hits        14706    16371    +1665     
- Misses       1756     1904     +148     

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

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.

Thanks

@fthobe
Copy link
Contributor Author

fthobe commented Jan 19, 2025

Thanks

It would be great if you 4 adhere to same standard that you ask from my two guys and document things properly.

@fthobe fthobe changed the title Restore Puma version pin Restore Puma SQLite dependency to correct state Jan 19, 2025
@fthobe fthobe changed the title Restore Puma SQLite dependency to correct state Restore Puma & SQLite dependency to correct state Jan 19, 2025
@tvdeyen tvdeyen merged commit ca1ae4d into solidusio:main Jan 31, 2025
14 of 16 checks passed
@tvdeyen tvdeyen added the backport-v4.4 Backport this pull-request to v4.4 label Feb 5, 2025
Copy link

github-actions bot commented Feb 5, 2025

💚 All backports created successfully

Status Branch Result
v4.4

Questions ?

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

@tvdeyen tvdeyen added 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 Feb 5, 2025
Copy link

github-actions bot commented Feb 5, 2025

💔 All backports failed

Status Branch Result
v4.1 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.1:
- Use bundler gem tasks instead of gem_release
v4.2 Backport failed because of merge conflicts
v4.3 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.3:
- Lock rack to be less than 3
- Add a DummyApp sprockets 4 configuration manifest
v4.4 An unhandled error occurred. Please see the logs for details

Manual backport

To create the backport manually run:

backport --pr 6082

Questions ?

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

Copy link

github-actions bot commented Feb 5, 2025

💔 Some backports could not be created

Status Branch Result
v4.1 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.1:
- Use bundler gem tasks instead of gem_release
v4.2 Backport failed because of merge conflicts
v4.3 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.3:
- Lock rack to be less than 3
- Add a DummyApp sprockets 4 configuration manifest
v4.4

Manual backport

To create the backport manually run:

backport --pr 6082

Questions ?

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

Copy link

github-actions bot commented Feb 5, 2025

💔 Some backports could not be created

Status Branch Result
v4.1 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.1:
- Use bundler gem tasks instead of gem_release
v4.2 Backport failed because of merge conflicts
v4.3 Backport failed because of merge conflicts

You might need to backport the following PRs to v4.3:
- Lock rack to be less than 3
- Add a DummyApp sprockets 4 configuration manifest
v4.4

Manual backport

To create the backport manually run:

backport --pr 6082

Questions ?

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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 backport-v4.4 Backport this pull-request to v4.4 changelog:repository Changes to the repository not within any gem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change Puma dependency back from development branch to stable release
3 participants