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
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.1
3.3.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM ruby:3.1
FROM ruby:3.3
LABEL PURPOSE="This image is configured to build and run swift website"

RUN mkdir -p /src
Expand All @@ -20,7 +20,7 @@ ENV LC_ALL: C.UTF-8
ENV LANG: en_US.UTF-8
ENV LANGUAGE: en_US.UTF-8

RUN gem install bundler -v '~> 2.3.13'
RUN gem install bundler -v '~> 2.5.5'

COPY Gemfile Gemfile.lock /src/
RUN bundle install -j $(nproc)
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#ruby '2.2.1'
source 'https://rubygems.org'

gem 'jekyll', '~> 4.2.1'
gem 'jekyll', '~> 4.3.3'
gem 'jekyll-redirect-from'

gem 'liquid', '~> 4.0.4'

gem "webrick", "~> 1.7"
59 changes: 32 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,72 +1,77 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.10)
concurrent-ruby (1.2.3)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.5)
ffi (1.16.3)
forwardable-extended (2.6.0)
google-protobuf (3.25.2)
http_parser.rb (0.8.0)
i18n (1.10.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.2.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.1)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
rb-fsevent (0.11.1)
public_suffix (5.0.4)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.28.0)
rexml (3.2.6)
rouge (4.2.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.8.0)
webrick (1.7.0)
sass-embedded (1.70.0)
google-protobuf (~> 3.25)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
ruby

DEPENDENCIES
jekyll (~> 4.2.1)
jekyll (~> 4.3.3)
jekyll-redirect-from
liquid (~> 4.0.4)
webrick (~> 1.7)

BUNDLED WITH
2.3.13
2.5.5
2 changes: 1 addition & 1 deletion assets/stylesheets/_mobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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.

main {
max-width: 100%;
min-width: 320px;
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/pages/_landing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
padding-top: .5rem;
}

@media only screen and(max-width: 767px) {
@media only screen and (max-width: 767px) {
font-size: 24px;
}
}
Expand Down
6 changes: 3 additions & 3 deletions assets/stylesheets/pages/_packages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
grid-template-columns: 1fr 1fr;
gap: 20px;

@media only screen and(max-width: 767px) {
@media only screen and (max-width: 767px) {
grid-template-columns: 1fr;
}

Expand Down Expand Up @@ -45,7 +45,7 @@
}
}

@media only screen and(min-width: 767px) {
@media only screen and (min-width: 767px) {
&:first-child {
grid-column: span 2;
}
Expand All @@ -69,7 +69,7 @@
padding: 30px 0;
list-style: none;

@media only screen and(max-width: 767px) {
@media only screen and (max-width: 767px) {
grid-template-columns: 1fr;
}

Expand Down