Skip to content

Commit fc2a8b6

Browse files
committed
Merge branch 'update-puma' into update-rake
2 parents 2c42bfa + 45ee2d7 commit fc2a8b6

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.5.8

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
language: ruby
22
dist: bionic
33

4-
rvm: 2.5.1
4+
rvm: 2.5.8
55

66
services:
77
- redis
88

9+
env:
10+
global:
11+
- PATH=/snap/bin:$PATH
12+
913
cache: bundler
1014

1115
bundler_args: --without development --jobs 3 --retry 3 --deployment
1216

13-
before_install: gem install bundler
14-
1517
jobs:
1618
include:
1719
- stage: "rspec"
1820
script: bundle exec rspec spec
1921
- stage: ":ship: it"
22+
addons:
23+
snaps:
24+
- name: docker
25+
channel: latest/beta
2026
script: make ship
27+
if: (branch = master and type = push ) OR commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.1-slim
1+
FROM ruby:2.5.8-slim
22

33
LABEL maintainer Travis CI GmbH <support+travis-listener-docker-images@travis-ci.com>
44

@@ -9,16 +9,17 @@ RUN ( \
99
&& rm -rf /var/lib/apt/lists/* \
1010
)
1111

12-
# throw errors if Gemfile has been modified since Gemfile.lock
13-
RUN bundle config --global frozen 1
14-
1512
RUN mkdir -p /app
1613
WORKDIR /app
1714

1815
COPY Gemfile /app
1916
COPY Gemfile.lock /app
2017

21-
RUN bundler install --verbose --retry=3 --deployment --without development test
18+
RUN gem install bundler -v '1.17.3'
19+
# throw errors if Gemfile has been modified since Gemfile.lock
20+
RUN bundle config --global frozen 1
21+
RUN bundle install --verbose --retry=3 --deployment --without development test
22+
RUN gem install --user-install executable-hooks
2223

2324
COPY . /app
2425

Gemfile

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

3-
ruby '2.5.1'
3+
ruby '2.5.8'
44

55
gem 'travis-support', git: 'https://github.com/travis-ci/travis-support', ref: '113cff17fe383bb72fcfae3a97a8ce98c228342f'
66
gem 'travis-config', '~> 1.0.0'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GEM
4949
pry (0.11.3)
5050
coderay (~> 1.1.0)
5151
method_source (~> 0.9.0)
52-
puma (3.12.2)
52+
puma (3.12.6)
5353
rack (2.0.8)
5454
rack-protection (2.0.3)
5555
rack
@@ -110,7 +110,7 @@ DEPENDENCIES
110110
yajl-ruby (~> 1.4.0)
111111

112112
RUBY VERSION
113-
ruby 2.5.1p57
113+
ruby 2.5.8p224
114114

115115
BUNDLED WITH
116116
1.17.3

README.mdown

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ This is the first point of entry for build events from GitHub, and over time sup
1616
See LICENSE file.
1717

1818
Copyright (c) 2011 [Travis CI development team](https://github.com/travis-ci).
19-

0 commit comments

Comments
 (0)