Skip to content

Commit 1deeedb

Browse files
committed
Merge #686: Bump Ruby, Jekyll and jQuery
c6b2817 Bump jQuery to 3.4.1 (Sjors Provoost) 9aceff7 Upgrade Ruby to 2.5.1 and Jekyll from 3.0.2 to 3.8.5 (Sjors Provoost) 7526e8a Add .ruby-version for rvm and rbenv (Sjors Provoost) Pull request description: Builds on top of #684 * Ruby 2.2.2 is end of life, so bumping to the latest and greatest 2.6.5 * `bundle update` mainly: * bumps Jekyll from 3.0.2 to 3.8.5, which required small tweaks to two files, but otherwise seems to behave * bumps html-proofer from 2.6.4 to 3.14.1 which is a bit more strict, hence the link fixes * bumping jQuery from 1.9.1 to 3.4.1, from here: https://jquery.com/download/ (compressed, production jQuery 3.4.1), I didn't try the slim build ACKs for top commit: harding: Tested ACK c6b2817 (reviewed code, skimmed very large diff of site build with this merged on master versus just master, verified hash of updated jquery matches [upstream](https://code.jquery.com/jquery-3.4.1.min.js)) Tree-SHA512: f036d27aaa6322150911a028ad7159c723a8010f5ea81eb7e7dfc5afec274cc64ef29a9752f7b3d63f875659c123dc9cbee82ff6ca7ad392e5c7805b3ba215af
2 parents 5374215 + c6b2817 commit 1deeedb

File tree

11 files changed

+246
-125
lines changed

11 files changed

+246
-125
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.5.1

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: ruby
2-
rvm:
3-
- "2.2.2"
42

53
## Save bundler deps.
64
cache: bundler
75

6+
before_install:
7+
- gem update --system
8+
- gem --version
9+
810
## Disable external link checking to prevent spurious failures because
911
## of other people's downtime. This can also avoid wasting their
1012
## bandwidth.
@@ -16,7 +18,7 @@ script:
1618
env:
1719
global:
1820
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
19-
21+
2022
# Whitelist all branches
2123
branches:
2224
only:

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
source 'https://rubygems.org'
22

3-
## If you update the version here, also update it in .travis.yml and
4-
## README.md. Then push your branch and make sure Travis supports that
3+
## This version should match the version in Debian Stable.
4+
## If you update the version here, also update it in .ruby-version, .travis.yml
5+
## and README.md. Then push your branch and make sure Travis supports that
56
## version.
6-
ruby '2.2.2'
7+
ruby '2.5.1'
78

89
## If you add a new Gem below, run `bundle install` to install it.
910
group :development do

0 commit comments

Comments
 (0)