Merge pull request #420 from darklang/sam/rust-build

Add Rust to build process.

Dockerfile

@@ -275,6 +275,36 @@ ENV TERM=xterm-256color
 RUN opam install -y \
  ocamlformat
 
+########################
+# Install Rust toolchain
+########################
+
+USER root
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+ CARGO_HOME=/usr/local/cargo \
+ PATH=/usr/local/cargo/bin:$PATH \
+ RUST_VERSION=1.30.1
+
+RUN dpkgArch="$(dpkg --print-architecture)"; \
+ case "${dpkgArch##*-}" in \
+ amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='0077ff9c19f722e2be202698c037413099e1188c0c233c12a2297bf18e9ff6e7' ;; \
+ armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='f139e5be4ea2db7ff151c122f5d24af3c587c4fc74a7414e262cb34403278ad3' ;; \
+ arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='c7d5471e71a315134e7499af75eb177d1f574858f1c6b8e61b436702d671a4e2' ;; \
+ i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='909ce4e2d0c9bf60ba5a85426c38cceb5ae77979ab2b1e354e76b9851b5ec5ed' ;; \
+ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+ esac; \
+ url="https://static.rust-lang.org/rustup/archive/1.14.0/${rustArch}/rustup-init"; \
+ wget "$url"; \
+ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+ chmod +x rustup-init; \
+ ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
+ rm rustup-init; \
+ chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+ rustup --version; \
+ cargo --version; \
+ rustc --version;
+
 ############################
 # Finish
 ############################

scripts/builder

@@ -62,6 +62,8 @@ else
  MOUNTS+=" --mount type=volume,src=dark_server_build,dst=/home/dark/app/server/_build"
  MOUNTS+=" --mount type=volume,src=dark_client2_node_modules,dst=/home/dark/app/client2/node_modules"
  MOUNTS+=" --mount type=volume,src=dark_client2_lib,dst=/home/dark/app/client2/lib"
+ MOUNTS+=" --mount type=volume,src=dark_stroller_target,dst=/home/dark/app/stroller/target"
+ MOUNTS+=" --mount type=volume,src=dark_rust_cargo,dst=/usr/local/cargo"
 
  if [[ -e "../conduit-frontend" ]]; then
  MOUNTS="$MOUNTS --mount type=bind,src=$PWD/../conduit-frontend,dst=/home/dark/conduit-frontend"

scripts/clear-builder-volumes

@@ -5,4 +5,6 @@ set -euo pipefail
 docker volume rm \
  dark_server_build \
  dark_client2_node_modules \
- dark_client2_lib
+ dark_client2_lib \
+ dark_stroller_target \
+ dark_rust_cargo

scripts/support/build-server

@@ -46,6 +46,7 @@ def initial_compile():
  , "client2/package.json"
  , "client2/src/main.ml"
  , "client2/__tests__/ast_test.ml"
+ , "stroller/Cargo.toml"
  ]
  exit = compile(files)
 
@@ -157,6 +158,7 @@ def main():
  run_or_fail("sudo chown dark:dark server/_build || true")
  run_or_fail("sudo chown dark:dark client2/node_modules || true")
  run_or_fail("sudo chown dark:dark client2/lib || true")
+ run_or_fail("sudo chown dark:dark stroller/target || true")
  run_or_fail("scripts/support/write-config-file")
  run_or_fail("scripts/support/allow-docker-access")
  create_app_dirs()

scripts/support/compile

@@ -138,6 +138,28 @@ def server_test():
  + ci
  + " 2>&1")
 
+def stroller_build():
+ start = time.time()
+ global profile
+
+ if os.environ.get("CI"):
+ build_flags = " --release"
+ pass
+ else:
+ build_flags = ""
+ pass
+
+ build = "cd stroller && unbuffer cargo build" + build_flags
+ if profile:
+ return run_backend(start, landmarks + build)
+ else:
+ return run_backend(start, build)
+
+def stroller_test():
+ start = time.time()
+ return run_test(start,
+ "cd stroller && unbuffer cargo test")
+
 def reload_server():
  start = time.time()
  global profile
@@ -160,6 +182,8 @@ class Should:
  def __init__(self):
  self.server_build = False
  self.server_test = False
+ self.stroller_build = False
+ self.stroller_test = False
  self.npm_install = False
  self.client2_build = False
  self.bundlejs_build = False
@@ -174,6 +198,11 @@ def execute(should):
  sb = should.server_build and server_build()
  should.reload_server |= sb
 
+ stb = should.stroller_build and stroller_build()
+
+ should.stroller_test |= stb
+ stt = should.stroller_test and stroller_test()
+
  ni = should.npm_install and npm_install ()
  should.client2_build |= ni
  should.darkex_build |= ni
@@ -199,7 +228,7 @@ def execute(should):
  should.server_test |= sb
  ot = should.server_test and server_test()
 
- return sb and ni and c2b and bjsb and deb and c2t and ge and rs and rb and ot
+ return sb and stb and stt and ni and c2b and bjsb and deb and c2t and ge and rs and rb and ot
 
 
 
@@ -221,6 +250,12 @@ def mark(should, f):
  elif "scripts/support/runserver" in f:
  should.reload_server = True
 
+ # Rust
+ elif ("stroller/" in f) \
+ and (("Cargo.toml" in f) \
+ or (".rs" in f)):
+ should.stroller_build = True
+
  # JS
  elif "client2/package.json" in f:
  should.npm_install = True