Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem 'tzinfo-data', :platforms => [:mswin, :mingw, :x64_mingw]
gem 'icalendar'

# For testing output
gem 'html-proofer', '~> 3'
gem 'html-proofer', '~> 5'

# Avoid polling on windows
gem 'wdm', '>= 0.1.0'
50 changes: 40 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,51 @@
GEM
remote: https://rubygems.org/
specs:
Ascii85 (2.0.1)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
afm (1.0.1)
async (2.46.0)
console (~> 1.29)
fiber-annotation
io-event (~> 1.21)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (3.3.1)
colorator (1.1.0)
concurrent-ruby (1.3.7)
console (1.38.0)
fiber-annotation
fiber-local (~> 1.1)
json
csv (3.3.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
ethon (0.16.0)
ethon (0.19.1)
ffi (>= 1.15.0)
logger
eventmachine (1.2.7)
eventmachine (1.2.7-x86-mingw32)
ffi (1.17.0)
ffi (1.17.0-x64-mingw-ucrt)
ffi (1.17.0-x86-mingw32)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (1.0.1)
forwardable-extended (2.6.0)
html-proofer (3.19.4)
hashery (2.1.2)
html-proofer (5.2.3)
addressable (~> 2.3)
mercenary (~> 0.3)
async (~> 2.1)
benchmark (~> 0.5)
nokogiri (~> 1.13)
parallel (~> 1.10)
pdf-reader (~> 2.11)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
Expand All @@ -34,6 +55,7 @@ GEM
logger
ostruct
ice_cube (0.17.0)
io-event (1.22.3)
jekyll (3.10.0)
addressable (~> 2.4)
colorator (~> 1.0)
Expand All @@ -58,6 +80,7 @@ GEM
sass (~> 3.4)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (3.1.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -69,15 +92,19 @@ GEM
logger (1.7.0)
mercenary (0.3.6)
mini_portile2 (2.8.9)
nokogiri (1.19.4)
nokogiri (1.19.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.19.4-x64-mingw-ucrt)
nokogiri (1.19.7-x64-mingw-ucrt)
racc (~> 1.4)
ostruct (0.6.3)
parallel (1.24.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pdf-reader (2.16.0)
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
afm (>= 0.2.1, < 2)
hashery (~> 2.0)
ttfunk
public_suffix (7.0.5)
racc (1.8.1)
rainbow (3.1.1)
Expand All @@ -94,23 +121,26 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
thread_safe (0.3.6)
typhoeus (1.4.1)
ethon (>= 0.9.0)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
typhoeus (1.7.1)
ethon (>= 0.19.1, < 0.20.0)
tzinfo (1.2.10)
thread_safe (~> 0.1)
tzinfo-data (1.2018.5)
tzinfo (>= 1.0.0)
wdm (0.1.1)
webrick (1.8.2)
yell (2.2.2)
zeitwerk (2.8.3)

PLATFORMS
ruby
x64-mingw-ucrt
x86-mingw32

DEPENDENCIES
html-proofer (~> 3)
html-proofer (~> 5)
icalendar
jekyll (~> 3)
jekyll-feed
Expand Down
16 changes: 9 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@ task :validate_build => [:build] do
sh('bundle exec ruby scripts/validate-icalendar.rb')

# Explanation of arguments:
# --disable-external # For speed. Ideally we'd check external links too, but ignoring for now.
# --empty-alt-ignore # To avoid needing to fix lots upfront, we can migrate towards this later.
# --allow-hash-href # Allow empty `#` links to mean "top of page". It's true that these can be errors, however we have far too many to really address this.
# --url-swap # Adjust for Jekyll's baseurl. See https://github.com/gjtorikian/html-proofer/issues/618 for more.
# --url-ignore # Allow mailto links without a target email, for our Share links. Works around https://github.com/gjtorikian/html-proofer/issues/552.
# # Allow old event links which aren't easily updated.
sh('bundle exec htmlproofer _site --disable-external --empty-alt-ignore --allow-hash-href --url-swap "^/website/:/" --url-ignore "/^mailto:?/,/^\/events\/sr201[23]/"')
# --disable-external # For speed. Ideally we'd check external links too, but ignoring for now.
# --ignore-missing-alt # To avoid needing to fix lots upfront, we can migrate towards this later.
# --ignore-empty-mailto # Allow mailto links without a target email, for our Share links.
# --allow-hash-href # Allow empty `#` links to mean "top of page". It's true that these can be errors, however we have far too many to really address this.
# --allow-missing-href # Allow `href` to be omitted, so that `<a>` elements can be anchors.
# --no-enforce-https # Don't enforce HTTPS. Ideally we'll upgrade all the links, however there's many old links here which aren't trivial to fix.
# --swap-urls # Adjust for Jekyll's baseurl. See https://github.com/gjtorikian/html-proofer/issues/618 for more.
# --ignore-urls # Allow old event links which aren't easily updated.
sh('bundle exec htmlproofer _site --disable-external --ignore-missing-alt --ignore-empty-mailto --allow-hash-href --allow-missing-href --no-enforce-https --swap-urls "^/website/:/" --ignore-urls "/^\/events\/sr201[23]/"')
end

task :validate_spellings => [:build_spellings] do
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ social:

sponsors:
- name: University of Southampton
link: //www.southampton.ac.uk/
link: https://www.southampton.ac.uk/
image: /images/sponsors/university-of-southampton.svg
logo_width: default

Expand Down
6 changes: 3 additions & 3 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ <h4>Student Robotics</h4>
<p>&nbsp;</p>
<p>
The fantastic photos come from
<a href="//www.flickr.com/photos/richardpbarlow/">Richard Barlow</a>,
<a href="//www.flickr.com/photos/howiegoing/">Howard Buck</a>,
<a href="//www.flickr.com/photos/theorangeone/">Jake Howard</a>,
<a href="https://www.flickr.com/photos/richardpbarlow/">Richard Barlow</a>,
<a href="https://www.flickr.com/photos/howiegoing/">Howard Buck</a>,
<a href="https://www.flickr.com/photos/theorangeone/">Jake Howard</a>,
Laurie Kirkcaldy,
Anton Nikitin,
Antoine Petty, and
Expand Down
2 changes: 1 addition & 1 deletion _includes/team-signup.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form action="//studentrobotics.us12.list-manage.com/subscribe/post?u=1af17c2a3426de258620aae46&amp;id=dd7d04139d"
<form action="https://studentrobotics.us12.list-manage.com/subscribe/post?u=1af17c2a3426de258620aae46&amp;id=dd7d04139d"
method="post"
id="mc-embedded-subscribe-form"
name="mc-embedded-subscribe-form"
Expand Down
2 changes: 1 addition & 1 deletion _includes/volunteer-signup.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form action="//studentrobotics.us12.list-manage.com/subscribe/post?u=1af17c2a3426de258620aae46&amp;id=220e1d8952"
<form action="https://studentrobotics.us12.list-manage.com/subscribe/post?u=1af17c2a3426de258620aae46&amp;id=220e1d8952"
method="post"
id="mc-embedded-subscribe-form"
name="mc-embedded-subscribe-form"
Expand Down
Loading