Skip to content

Commit 426694b

Browse files
author
vitalie
committed
Fix build
1 parent 67f1396 commit 426694b

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ jobs:
3232
- stage: test
3333
env:
3434
script: ./script/validate-example-payloads-with-docker
35+
3536
- stage: ':ship: it to quay.io'
3637
env:
3738
script: ./script/docker-build-and-push
3839
if: (branch = master and type = push ) OR commit_message =~ /ship:docker/ OR env(SHIP_DOCKER) = true
3940

41+
before_install:
42+
- gem update --silent --system 3.3.26
43+
4044
before_script:
41-
- "gem install bundler -v 1.17.3"
4245
- eval "$(script/handle-docker-config)"
4346
- bundle install
4447
- bundle exec rake clean assets:precompile
@@ -57,7 +60,6 @@ after_failure: bundle exec rake dump_examples_logs
5760
before_deploy:
5861
- sudo pip install -U -I Pygments
5962
- ./script/build-s3-index-html
60-
- "gem install bundler -v 1.17.3"
6163

6264
deploy:
6365
provider: s3

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,27 @@ COPY . .
88
RUN git describe --always --dirty --tags | tee VERSION
99
RUN git rev-parse --short HEAD | tee BUILD_SLUG_COMMIT
1010
RUN rm -rf .git
11+
RUN gem update --silent --system 3.3.26
1112
RUN bundle install --frozen --deployment --without='development test' --clean
1213
RUN bundle exec rake assets:precompile GITHUB_OAUTH_TOKEN=$GITHUB_OAUTH_TOKEN
1314
RUN tar -cjf public.tar.bz2 public && rm -rf public
1415

16+
1517
FROM ruby:2.5.8-slim
1618
LABEL maintainer Travis CI GmbH <support+travis-build-docker-images@travis-ci.com>
19+
1720
WORKDIR /app
1821

1922
ENV TRAVIS_BUILD_DUMP_BACKTRACE true
2023
ENV PORT 4000
2124

25+
RUN gem update --silent --system 3.3.26
26+
2227
COPY --from=builder /app /app
2328
COPY --from=builder /usr/local/bundle/config /usr/local/bundle/config
2429

2530
HEALTHCHECK --interval=5s CMD script/healthcheck
31+
2632
EXPOSE 4000/tcp
33+
2734
CMD ["script/server"]

Gemfile.lock

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,5 +271,8 @@ DEPENDENCIES
271271
travis-support!
272272
webmock
273273

274+
RUBY VERSION
275+
ruby 2.5.8p224
276+
274277
BUNDLED WITH
275-
1.17.3
278+
2.3.26

public/version-aliases/ghc.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@
166166
"9.0.1-alpha1": "9.0.1-alpha1",
167167
"9.0": "9.0.2",
168168
"9.0.1": "9.0.1",
169-
"9": "9.6.0.20230302",
170-
"9.x": "9.6.0.20230302",
171-
"9.x.x": "9.6.0.20230302",
169+
"9": "9.6.1",
170+
"9.x": "9.6.1",
171+
"9.x.x": "9.6.1",
172172
"9.0.x": "9.0.2",
173173
"9.0.2": "9.0.2",
174174
"9.2.1-alpha1": "9.2.1-alpha1",
@@ -192,12 +192,13 @@
192192
"9.4.3": "9.4.3",
193193
"9.4.4": "9.4.4",
194194
"9.6.0.20230111": "9.6.0.20230111",
195-
"9.6.x": "9.6.0.20230302",
196-
"9.6": "9.6.1-alpha3",
195+
"9.6.x": "9.6.1",
196+
"9.6": "9.6.1",
197197
"9.6.0.20230128": "9.6.0.20230128",
198198
"9.6.0.20230210": "9.6.0.20230210",
199199
"9.6.0.20230302": "9.6.0.20230302",
200200
"9.6.1-alpha1": "9.6.1-alpha1",
201201
"9.6.1-alpha2": "9.6.1-alpha2",
202-
"9.6.1-alpha3": "9.6.1-alpha3"
202+
"9.6.1-alpha3": "9.6.1-alpha3",
203+
"9.6.1": "9.6.1"
203204
}

0 commit comments

Comments
 (0)