Skip to content

Commit

Permalink
Fix broken build
Browse files Browse the repository at this point in the history
Summary:
Ubuntu 17.10 is reaching End Of Life (EOL) according to https://wiki.ubuntu.com/Releases, and it looks like support is already dying, as the Travis build has been broken for a while.

This changes the Ubuntu version to 16.04, which will reach EOL in 2024, and makes the appropriate changes to make the `docker build` command work.

Reviewed By: tmelz, BurntBrunch, aandreyeu

Differential Revision: D15327841

fbshipit-source-id: 694481b967371b24c8193addeb0ca759c69148a7
  • Loading branch information
Ricardo Rey authored and facebook-github-bot committed May 14, 2019
1 parent 94a0ffa commit ec7753d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ services:
- docker

install:
- travis_wait 20 docker build -t profilo:17.10 -f build/Dockerfile .
- travis_wait 20 docker build -t profilo:16.04 -f build/Dockerfile .

script:
- set -e
- docker run -t profilo:17.10 /usr/bin/env TERM=dumb bash /repo/build/test.sh
- docker run -t profilo:17.10 /usr/bin/env TERM=dumb bash /repo/build/build.sh
- docker run -t profilo:16.04 /usr/bin/env TERM=dumb bash /repo/build/test.sh
- docker run -t profilo:16.04 /usr/bin/env TERM=dumb bash /repo/build/build.sh
- build/copy_artifacts_to_host.sh

before_deploy:
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:16.04
RUN apt-get update
RUN apt-get install -y --no-install-recommends ant git default-jdk python wget unzip

Expand Down
2 changes: 1 addition & 1 deletion build/setup_buck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -e
pushd /
git clone https://github.com/facebook/buck.git
cd buck
ant default
ANT_OPTS=-Xmx512m ant default
popd

0 comments on commit ec7753d

Please sign in to comment.