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 to Ruby 3.2 and latest Jekyll #349

Merged
merged 9 commits into from
Jan 30, 2024
Merged

Update to Ruby 3.2 and latest Jekyll #349

merged 9 commits into from
Jan 30, 2024

Conversation

daveverwer
Copy link
Contributor

@daveverwer daveverwer commented Jul 29, 2023

Fixes #347

As Tim suggested here, this fixes the site build process when trying to use Ruby 3.2 to build it.

  • Updated recommended version of Ruby to the latest stable, 3.2.0.
  • Removed unnecessary Ruby version comment from the top of the Gemfile.
  • Bundle update, including updating Jekyll to the latest 4.3.3.
  • Dockerfile updated to use Ruby 3.2 base image and latest Bundler version.
  • Sass files updated to parse correctly with the latest Jekyll.

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@tomerd
Copy link
Contributor

tomerd commented Jul 31, 2023

lgtm

@daveverwer
Copy link
Contributor Author

@shahmishal Are you happy with this? OK to merge?

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@shahmishal
Copy link
Member

@swift-ci test

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@daveverwer
Copy link
Contributor Author

@shahmishal this came up again just now in #475. We should try and get this merged if possible.

I just rebased it and did another bundle update to integrate gem changes since it was opened so it's still ready to go from my side.

@daveverwer
Copy link
Contributor Author

Rebased once more for discussion at tonight's SWWG meeting.

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@@ -85,7 +85,7 @@
}
}

@media only screen and(max-width: 767px) {
@media only screen and (max-width: 767px) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This whitespace is now required by the latest sass parser included with the latest Jekyll. See below for more instances of this.

@daveverwer
Copy link
Contributor Author

@swift-ci please test

@daveverwer
Copy link
Contributor Author

@shahmishal over to you!

@shahmishal shahmishal merged commit ca19ebd into main Jan 30, 2024
1 check passed
@shahmishal shahmishal deleted the ruby32 branch January 30, 2024 22:17
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.

Failed build when running locally
6 participants