about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-01-23 10:25:50 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-01-24 15:34:41 -0800
commite9a64996bedbc224d1edb401162d2c3cc15eb7c1 (patch)
tree25553fe77c16789e5978e3c8b1254c34eb16b0d0
parent63b3168448061a510915d76630c6803de8cac595 (diff)
llvm6: Update FreeBSD images to Ubuntu 18.04
Looks like the clang with 16.04 fails to compile LLVM 6, but it looks like clang
in 18.04 can indeed compile LLVM 6.
-rw-r--r--src/ci/docker/dist-i686-freebsd/Dockerfile2
-rw-r--r--src/ci/docker/dist-x86_64-freebsd/Dockerfile2
m---------src/llvm-emscripten0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/dist-i686-freebsd/Dockerfile b/src/ci/docker/dist-i686-freebsd/Dockerfile
index 686afc97289..673fa4c0c4b 100644
--- a/src/ci/docker/dist-i686-freebsd/Dockerfile
+++ b/src/ci/docker/dist-i686-freebsd/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   clang \
diff --git a/src/ci/docker/dist-x86_64-freebsd/Dockerfile b/src/ci/docker/dist-x86_64-freebsd/Dockerfile
index 7483d395622..f9f5b7062f8 100644
--- a/src/ci/docker/dist-x86_64-freebsd/Dockerfile
+++ b/src/ci/docker/dist-x86_64-freebsd/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   clang \
diff --git a/src/llvm-emscripten b/src/llvm-emscripten
new file mode 160000
+Subproject 2717444753318e461e0c3b30dacd03ffbac9690