Skip to content

Commit 6b00dd3

Browse files
Merge pull request #3495 from travis-ci/tbt-423-upgrade-ruby-v
[TBT-423] upgrade to ruby 3.2.9
1 parent df07edf commit 6b00dd3

File tree

17 files changed

+591
-254
lines changed

17 files changed

+591
-254
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.6.3
1+
3.2.9

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ jobs:
2525
apt:
2626
packages:
2727
- libxml2-utils
28+
- libxml2-dev
29+
- libxslt1-dev
30+
- pkg-config
31+
before_install:
32+
- bundle config set force_ruby_platform true
2833
install:
29-
- rvm use 2.6.3 --install
34+
- rvm use 3.2.9 --install
3035
- bundle install --deployment
3136
- sudo apt-get install libcurl4-openssl-dev # required to avoid SSL errors
3237
script:

Dockerfile

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
FROM ruby:2.6.10-bullseye
2-
LABEL maintainer Travis CI GmbH <[email protected]>
1+
FROM ruby:3.2-slim
2+
LABEL maintainer="Travis CI GmbH <[email protected]>"
33

44
# packages required for bundle install
55
RUN ( \
66
apt-get update ; \
7-
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libcurl4-openssl-dev curl \
7+
apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libcurl4-openssl-dev curl nodejs \
88
&& rm -rf /var/lib/apt/lists/* \
99
)
1010

1111
# ------
1212
# Set the encoding to UTF-8
13-
ENV LC_ALL C.UTF-8
14-
ENV LANG en_US.UTF-8
15-
ENV LANGUAGE en_US.UTF-8
13+
ENV LC_ALL=C.UTF-8 \
14+
LANG=en_US.UTF-8 \
15+
LANGUAGE=en_US.UTF-8
1616
# -----
17-
ENV WEBHOOK_PAYLOAD_GIST_ID 4e317d6e71be6d0278be46bb751b2f78
17+
ENV WEBHOOK_PAYLOAD_GIST_ID=4e317d6e71be6d0278be46bb751b2f78
1818

1919
# throw errors if Gemfile has been modified since Gemfile.lock
2020
RUN bundle config --global frozen 1
21+
22+
# Configure bundler for production
2123
RUN mkdir -p /app
2224

2325
WORKDIR /app
24-
COPY Gemfile /app
26+
COPY Gemfile /app
2527
COPY Gemfile.lock /app
2628

27-
RUN gem install bundler:2.4.22
28-
RUN bundle install --verbose --retry=3
29+
# Install bundler and gems
30+
RUN gem install bundler:2.4.22 \
31+
&& bundle install --verbose --retry=3
2932
RUN gem install --user-install executable-hooks
3033

3134
COPY . /app
3235
RUN bundle exec rake build
33-
COPY . /app
3436

35-
CMD bundle exec puma -p 4000
37+
EXPOSE 4000
38+
CMD ["bundle", "exec", "puma", "-p", "4000"]

Gemfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source 'https://rubygems.org'
22

3-
ruby '>= 2.6.3', '< 2.7'
3+
ruby '~> 3.2'
44

55
gem 'faraday'
66
gem 'html-proofer', '~> 3.0'
7-
gem 'jekyll', '>=3.1.6'
7+
gem 'jekyll', '~> 4.3'
88
gem 'jekyll-paginate'
99
gem 'jekyll-redirect-from'
1010
gem 'puma'
1111
gem 'pry', group: :test
12-
gem 'rack', '~> 1.0'
12+
gem 'rack', '~> 3.0'
1313
gem 'rack-jekyll'
1414
gem 'rack-ssl-enforcer'
1515
gem 'rake'
@@ -19,7 +19,8 @@ gem 'rubocop', group: :test
1919

2020
# All of this is for Slate / middleman
2121

22-
gem "middleman", '~> 3.0'
22+
gem "middleman", '~> 4.6'
23+
gem 'middleman-sprockets'
2324

2425
# For syntax highlighting
2526
gem "middleman-syntax"
@@ -38,8 +39,6 @@ platforms :mri_18 do
3839
gem "ruby18_source_location"
3940
end
4041

41-
gem 'therubyracer', :platforms => :ruby
42-
4342
# Remove warnings according to https://github.com/Compass/compass/pull/2088
4443
git 'https://github.com/ably-forks/compass', branch: 'sass-deprecation-warning-fix', ref: '3861c9d' do
4544
gem 'compass-core'

0 commit comments

Comments
 (0)