about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Lively <tlively@google.com>2019-10-09 14:17:48 -0700
committerThomas Lively <tlively@google.com>2019-10-16 17:06:48 -0700
commita2264f6af59f47497ccea65f29198edd2eb5ce58 (patch)
tree74a0aeb3ee5604cff3bfe26383694bb30c92315c
parent2bf59bea481dd4b4365cafe2e94fa8bf330a6877 (diff)
downloadrust-a2264f6af59f47497ccea65f29198edd2eb5ce58.tar.gz
rust-a2264f6af59f47497ccea65f29198edd2eb5ce58.zip
Temporarily enable asmjs and wasm32 on PR CI
-rw-r--r--src/ci/azure-pipelines/pr.yml4
-rw-r--r--src/ci/docker/wasm32/Dockerfile (renamed from src/ci/docker/disabled/wasm32/Dockerfile)0
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/azure-pipelines/pr.yml b/src/ci/azure-pipelines/pr.yml
index 62e23efe1ef..07c79d8cc96 100644
--- a/src/ci/azure-pipelines/pr.yml
+++ b/src/ci/azure-pipelines/pr.yml
@@ -22,6 +22,10 @@ jobs:
         IMAGE: x86_64-gnu-llvm-6.0
       mingw-check:
         IMAGE: mingw-check
+      asmjs:
+        IMAGE: asmjs
+      wasm32:
+        IMAGE: wasm32
 
 - job: LinuxTools
   timeoutInMinutes: 600
diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile
index aeccbb9bdc0..aeccbb9bdc0 100644
--- a/src/ci/docker/disabled/wasm32/Dockerfile
+++ b/src/ci/docker/wasm32/Dockerfile