Added Cache, improved LLVM install

wasmerio · Aug 10, 2019 · 59a7f21 · 59a7f21
1 parent a82907e
commit 59a7f21
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/.azure/install-llvm.yml b/.azure/install-llvm.yml
@@ -8,8 +8,9 @@ steps:
       else
         curl -O https://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-apple-darwin.tar.xz
         tar xf clang+llvm-8.0.0-x86_64-apple-darwin.tar.xz
-        export LLVM_SYS_80_PREFIX="`pwd`/clang+llvm-8.0.0-x86_64-apple-darwin/"
-        echo "##vso[task.prependpath]$LLVM_SYS_80_PREFIX/bin"
+        export LLVM_PATH="`pwd`/clang+llvm-8.0.0-x86_64-apple-darwin/"
+        echo "##vso[task.prependpath]$LLVM_PATH/bin"
+        echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]$LLVM_PATH"
       fi
     displayName: "Install LLVM (macOS)"
     condition: eq(variables['Agent.OS'], 'Darwin')
@@ -21,8 +22,9 @@ steps:
       else
         curl -O https://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
         tar xf clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-        export LLVM_SYS_80_PREFIX="`pwd`/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/"
-        echo "##vso[task.prependpath]$LLVM_SYS_80_PREFIX/bin"
+        export LLVM_PATH="`pwd`/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/"
+        echo "##vso[task.prependpath]$LLVM_PATH/bin"
+        echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]$LLVM_PATH"
       fi
     displayName: "Install LLVM (Linux)"
     condition: eq(variables['Agent.OS'], 'Linux')
@@ -33,9 +35,10 @@ steps:
         echo `command -v cmake` `llvm-config --version` installed
       else
         curl -O https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
-        unzip llvm-8.0.0-install.zip
-        export LLVM_SYS_80_PREFIX="`pwd`/llvm-8.0.0-install/"
-        echo "##vso[task.prependpath]$LLVM_SYS_80_PREFIX/bin"
+        7z x llvm-8.0.0-install.zip
+        export LLVM_PATH="`pwd`/llvm-8.0.0-install/"
+        echo "##vso[task.prependpath]$LLVM_PATH/bin"
+        echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]$LLVM_PATH"
         # chocolatey install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
       fi
     displayName: "Install LLVM (Windows)"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -35,12 +35,23 @@ jobs:
   pool:
     vmImage: $(imageName)
 
-  steps:
+variables:
+  CARGO_TARGET_FOLDER: $(Pipeline.Workspace)/target
+
+steps:
     - checkout: self
       submodules: true
     - template: .azure/install-rust.yml
     - template: .azure/install-cmake.yml
     - template: .azure/install-llvm.yml
+    - task: CacheBeta@0
+      inputs:
+        key: |
+          cargo
+          $(Agent.OS)
+          $(Build.SourcesDirectory)/Cargo.lock
+        path: $(CARGO_TARGET_FOLDER)
+      displayName: Cache Cargo Target
     - bash: make check
       displayName: Check with Flags
     - bash: make test