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

chore: dependency upgrades #33

Merged
merged 3 commits into from
Mar 22, 2024
Merged

chore: dependency upgrades #33

merged 3 commits into from
Mar 22, 2024

Conversation

josephineweidner
Copy link
Contributor

These changes were necessary to get this repo running on my Mac M1. This PR also adds the active_model_serializers gem (necessary for #32).

Will leave comments throughout and mark as draft until I'm confident in this being merged

Copy link
Contributor Author

@josephineweidner josephineweidner left a comment

Choose a reason for hiding this comment

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

@joshmcclain I feel like I've spent too long trying to get this up and running properly. Can we pair on this during our 1-1 on Monday?

@@ -13,13 +13,13 @@ gem 'webpacker', '~> 4.0'
gem 'turbolinks', '~> 5'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'activeadmin'
gem 'devise', github: 'heartcombo/devise', branch: 'ca-omniauth-2'
gem 'devise'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like the ca-omniauth-2 branch doesn't exist anymore and was merged into main for versions 4.8 and later heartcombo/devise#5327 (comment)


PLATFORMS
ruby
arm64-darwin-23
x86_64-linux
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🤔 not sure this change is ok but bundle lock --add-platform ruby didn't work as expected

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@joshmcclain this is the main concern. Adding x86_64-linux allows the Heroku integration tests to pass. Is that sufficient?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep that should be sufficient. There's some history at play here: older versions of bundler used to just include ruby as the default fallback platform, but newer versions started to list the actual platform targets explicitly. So the way you have it should be fine. It's the more up-to-date way of specifying platforms in this file.

Copy link
Contributor

Choose a reason for hiding this comment

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

(And I see below that you bundled with 2.4.22, so this is expected)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh great! Alicia and I were wondering about this on Cocoon, too.

@joshmcclain
Copy link
Contributor

@josephineweidner yes absolutely! Can you qualify "properly"? Tests in CI look okay -- is there an error you're hitting locally?

@josephineweidner
Copy link
Contributor Author

@joshmcclain yes! Responded inline in the comment above!

@josephineweidner josephineweidner marked this pull request as ready for review March 22, 2024 14:47
@josephineweidner
Copy link
Contributor Author

@joshmcclain this should be ready for approval and merge in that case! Thanks for your review 🙏

Copy link
Contributor

@joshmcclain joshmcclain left a comment

Choose a reason for hiding this comment

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

Looks good!

@josephineweidner josephineweidner merged commit 9c6513d into main Mar 22, 2024
1 check passed
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.

2 participants