Trying to fix pipelines

This commit is contained in:
Syrus 2019-09-01 11:15:35 -07:00
parent 4c2e5eddf7
commit 8965314529
3 changed files with 27 additions and 33 deletions

View File

@ -29,24 +29,18 @@ steps:
displayName: "Install LLVM (Linux)"
condition: eq(variables['Agent.OS'], 'Linux')
# - bash: |
# set -ex
# if [ -x "`command -v llvm-config`" ]; then
# echo `command -v cmake` `llvm-config --version` installed
# else
# mkdir C:\projects\deps
# cd C:\projects\deps
# curl -OL https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
# 7z x llvm-8.0.0-install.zip
# echo "##vso[task.prependpath]/c/projects/deps/llvm-8.0.0-install/bin"
# echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]C:\\projects\\deps\\llvm-8.0.0-install"
# fi
# displayName: "Install LLVM (Windows)"
# condition: eq(variables['Agent.OS'], 'Windows_NT')
- powershell: |
Invoke-WebRequest https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
- bash: |
set -ex
curl -OL https://github.com/wasmerio/windows-llvm-build/releases/download/v8.0.0/llvm-8.0.0-install.zip
7z x llvm-8.0.0-install.zip
llvm=`pwd`/llvm-8.0.0-install
echo "##vso[task.prependpath]$llvm/bin"
echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX;]$llvm"
displayName: "Install LLVM (Windows)"
condition: eq(variables['Agent.OS'], 'Windows_NT')
# Just to make sure the paths and vars are set properly
- powershell: |
Write-Host "##vso[task.prependpath]$pwd/llvm-8.0.0-install/bin"
Write-Host "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX;]$pwd/llvm-8.0.0-install/"
displayName: Install LLVM (Windows)

View File

@ -6,15 +6,15 @@
# Wasm-bindgen template: https://github.com/rustwasm/wasm-bindgen/blob/master/ci/azure-install-rust.yml
steps:
- bash: |
set -ex
brew install openssl curl
brew link openssl --force
echo "##vso[task.prependpath]/usr/local/opt/openssl/bin"
echo "##vso[task.setvariable variable=LDFLAGS;]-L/usr/local/opt/openssl/lib"
echo "##vso[task.setvariable variable=CPPFLAGS;]-I/usr/local/opt/openssl/include"
displayName: "Fix Cargo SSL (macOS)"
condition: eq(variables['Agent.OS'], 'Darwin')
# - bash: |
# set -ex
# brew install openssl@1.1 curl
# brew link openssl@1.1 --force
# echo "##vso[task.prependpath]/usr/local/opt/openssl/bin"
# echo "##vso[task.setvariable variable=LDFLAGS;]-L/usr/local/opt/openssl/lib"
# echo "##vso[task.setvariable variable=CPPFLAGS;]-I/usr/local/opt/openssl/include"
# displayName: "Fix Cargo SSL (macOS)"
# condition: eq(variables['Agent.OS'], 'Darwin')
- bash: |
set -ex
if [ -x "`command -v rustup`" ]; then

View File

@ -29,10 +29,10 @@ jobs:
matrix:
linux:
imageName: "ubuntu-16.04"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
mac:
imageName: "macos-10.14"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
# By default schannel checks revocation of certificates unlike some other SSL
# backends, but we've historically had problems on CI where a revocation
# server goes down presumably. See #43333 for more info
@ -61,7 +61,7 @@ jobs:
pool:
vmImage: "ubuntu-16.04"
variables:
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
steps:
- checkout: self
@ -79,10 +79,10 @@ jobs:
matrix:
linux:
imageName: "ubuntu-16.04"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
mac:
imageName: "macos-10.14"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
MACOSX_DEPLOYMENT_TARGET: 10.10
windows:
imageName: "vs2017-win2016"
@ -142,10 +142,10 @@ jobs:
matrix:
linux:
imageName: "ubuntu-16.04"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
mac:
imageName: "macos-10.14"
rust_toolchain: nightly-2019-07-04
rust_toolchain: nightly-2019-08-15
MACOSX_DEPLOYMENT_TARGET: 10.10
windows:
imageName: "vs2017-win2016"