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

Update everything #120

Merged
merged 14 commits into from
Dec 12, 2024
Merged

Update everything #120

merged 14 commits into from
Dec 12, 2024

Conversation

frothedoatmilk
Copy link
Contributor

@frothedoatmilk frothedoatmilk commented Nov 28, 2024

This was the latest version I could get to before bumping the bundler version, since middleman 4.4 started requiring bundle ~> 2.0. Bumping ruby, bundler, and middleman to their latest versions.

middleman has deprecated middleman-sprockets in favor of their external_pipeline system, thus the two new calls to that. We don't need an explicit command because these assets are downloaded as part of the gem when we bundle! When the site builds, it drags over some copies of those files into the appropriate directories.

This change also now makes all of Bootstrap's JS tooling available if we want it. We're not requiring it in all.js atm so it's not actually being loaded on the page for the time being.

For some reason, I still need to manually tell SassC where the Bootstrap files are. Not the Font Awesome ones though! I've poked around for a while trying to figure out what's causing this to no avail. No config edit leads to a SassC compile error.

@frothedoatmilk
Copy link
Contributor Author

Also, it appears that the new way Middleman handles Sass files involves trimming off the file extension as it goes. So I dropped in a .css into its filename. Without it, the stylesheet ends up as /stylesheets/all instead of /stylesheets/all.css

@sfan5 sfan5 self-requested a review November 28, 2024 08:31
@sfan5
Copy link
Member

sfan5 commented Dec 4, 2024

I've been messing around for 20 minutes and getting a working ruby 2.7 environment set up has turned out to be harder than expected. You'll have to wait a bit more for me to review this.

@kasper93
Copy link
Contributor

kasper93 commented Dec 4, 2024

I've been messing around for 20 minutes and getting a working ruby 2.7 environment set up has turned out to be harder than expected. You'll have to wait a bit more for me to review this.

I know the pain. Been there. Use docker, docker run -v "$(pwd)"/:/app -p 4567:4567 -it ruby:2.7.8 /bin/bash and install remaining things inside. Works fine.

This was the latest version I could get to before bumping the bundler version

Could we maybe just bump everything? It's getting quite hard to test, deploy those old versions.

@frothedoatmilk
Copy link
Contributor Author

Sure, that was my plan eventually, I just didn't want to change too many things in one PR.

@frothedoatmilk frothedoatmilk changed the title Go to middleman 4.3.11 Update everything Dec 4, 2024
@frothedoatmilk
Copy link
Contributor Author

Fortunately no big changes! I had to put in webrick for a second but after updating middleman that issue went away so I dropped it from the Gemfile again. The depreciation warnings are not from us, all are middleman dependencies, so I didn't silence them.

@frothedoatmilk
Copy link
Contributor Author

Just tested, still get that SassC error after bumps. Not sure what that's about

@pigoz
Copy link
Member

pigoz commented Dec 9, 2024

If the SassC issue is we need the following line, I think we can live with it.

config[:sass_assets_paths] << Bootstrap.stylesheets_path

This would probably not be needed with later versions of Bootstrap (>4 moved to gem "bootstrap"). BTW the website could probably be updated to not even need Bootstrap since CSS has come a long way since 2013.

Don't need to specify outdated bundler versions anymore, rbenv/rvm are
way easier for people unfamiliar with ruby, and rehash no longer needs
to be run explicitly with rbenv as it does so automatically after new gems
are installed
@frothedoatmilk
Copy link
Contributor Author

Would be interesting to see if bootstrap bumps will fix that. I'm very hesitant to do that in this PR though, SassC's 4 year EOL + two major bumps would definitely add to the diff.

Copy link
Member

@sfan5 sfan5 left a comment

Choose a reason for hiding this comment

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

other than that: works. thanks for contributing.

Co-authored-by: sfan5 <[email protected]>
@sfan5 sfan5 merged commit c25190a into mpv-player:master Dec 12, 2024
@frothedoatmilk frothedoatmilk deleted the middleman-4 branch December 12, 2024 16:10
@llyyr
Copy link
Contributor

llyyr commented Dec 13, 2024

The manual no longer has the sidebar and options no longer have hyperlinks associated to them after this https://mpv.io/manual/master/

@pigoz
Copy link
Member

pigoz commented Dec 13, 2024

I've pushed a fix but it looks like it's not being built.

@sfan5
Copy link
Member

sfan5 commented Dec 13, 2024

The workflow runs here and every day at 8am. I'll trigger it manually now.

@pigoz
Copy link
Member

pigoz commented Dec 13, 2024

Would it be welcome if I added Github Actions to automatically deploy on Cloudflare Pages so we can drop Github Pages? It even supports preview links on PRs with can be nice to test changes actually work.

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