mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-11 16:22:38 +03:00
Fixes for travic CI build (#3)
Summary: This should fix the Travis CI builds. It adds rust toolchain support inside docker and sets the required THRIFT env variable. Pull Request resolved: https://github.com/facebookexperimental/rust-shed/pull/3 Reviewed By: krallin Differential Revision: D18905608 Pulled By: lukaspiatkowski fbshipit-source-id: 5db1eff6f215a6617d8acaa0c99a62d45225956b
This commit is contained in:
committed by
Facebook Github Bot
parent
4b0975adcf
commit
3af1c72471
@@ -42,16 +42,20 @@ class DockerFBCodeBuilder(FBCodeBuilder):
|
||||
# To allow exercising non-root installs -- we change users after the
|
||||
# system packages are installed. TODO: For users not defined in the
|
||||
# image, we should probably `useradd`.
|
||||
return self.step('Setup', [
|
||||
# Docker's FROM does not understand shell quoting.
|
||||
ShellQuoted('FROM {}'.format(self.option('os_image'))),
|
||||
# /bin/sh syntax is a pain
|
||||
ShellQuoted('SHELL ["/bin/bash", "-c"]'),
|
||||
]
|
||||
+ self.install_debian_deps() + [self._change_user()]
|
||||
+ [self.workdir(self.option('prefix'))]
|
||||
return self.step(
|
||||
"Setup",
|
||||
[
|
||||
# Docker's FROM does not understand shell quoting.
|
||||
ShellQuoted("FROM {}".format(self.option("os_image"))),
|
||||
# /bin/sh syntax is a pain
|
||||
ShellQuoted('SHELL ["/bin/bash", "-c"]'),
|
||||
]
|
||||
+ self.install_debian_deps()
|
||||
+ [self._change_user()]
|
||||
+ [self.workdir(self.option("prefix"))]
|
||||
+ self.create_python_venv()
|
||||
+ self.python_venv()
|
||||
+ self.rust_toolchain(),
|
||||
)
|
||||
|
||||
def python_venv(self):
|
||||
@@ -71,6 +75,9 @@ class DockerFBCodeBuilder(FBCodeBuilder):
|
||||
def run(self, shell_cmd):
|
||||
return ShellQuoted('RUN {cmd}').format(cmd=shell_cmd)
|
||||
|
||||
def set_env(self, key, value):
|
||||
return ShellQuoted("ENV {key}={val}").format(key=key, val=value)
|
||||
|
||||
def workdir(self, dir):
|
||||
return [
|
||||
# As late as Docker 1.12.5, this results in `build` being owned
|
||||
|
Reference in New Issue
Block a user