Try to fix Windows

master
Alex Crichton 2019-04-02 12:12:19 -07:00
parent c880d1ca06
commit ca03cf138a
2 changed files with 66 additions and 66 deletions

View File

@ -2,67 +2,67 @@ trigger:
- master - master
jobs: jobs:
- job: Linux # - job: Linux
pool: # pool:
vmImage: ubuntu-16.04 # vmImage: ubuntu-16.04
steps: # steps:
- template: ci/azure-steps.yml # - template: ci/azure-steps.yml
strategy: # strategy:
matrix: # matrix:
aarch64: # aarch64:
TARGET: aarch64-unknown-linux-gnu # TARGET: aarch64-unknown-linux-gnu
# arm: # arm:
# TARGET: arm-unknown-linux-gnueabi # TARGET: arm-unknown-linux-gnueabi
# armhf: # armhf:
# TARGET: arm-unknown-linux-gnueabihf # TARGET: arm-unknown-linux-gnueabihf
# i586: # i586:
# TARGET: i586-unknown-linux-gnu # TARGET: i586-unknown-linux-gnu
# i686: # i686:
# TARGET: i686-unknown-linux-gnu # TARGET: i686-unknown-linux-gnu
# mips: # mips:
# TARGET: mips-unknown-linux-gnu # TARGET: mips-unknown-linux-gnu
# mips64: # mips64:
# TARGET: mips64-unknown-linux-gnuabi64 # TARGET: mips64-unknown-linux-gnuabi64
# mips64el: # mips64el:
# TARGET: mips64el-unknown-linux-gnuabi64 # TARGET: mips64el-unknown-linux-gnuabi64
# mipsel: # mipsel:
# TARGET: mipsel-unknown-linux-gnu # TARGET: mipsel-unknown-linux-gnu
# powerpc: # powerpc:
# TARGET: powerpc-unknown-linux-gnu # TARGET: powerpc-unknown-linux-gnu
# powerpc64: # powerpc64:
# TARGET: powerpc64-unknown-linux-gnu # TARGET: powerpc64-unknown-linux-gnu
# powerpc64le: # powerpc64le:
# TARGET: powerpc64le-unknown-linux-gnu # TARGET: powerpc64le-unknown-linux-gnu
thumbv6m: # thumbv6m:
TARGET: thumbv6m-linux-eabi # TARGET: thumbv6m-linux-eabi
XARGO: 1 # XARGO: 1
thumbv7em: # thumbv7em:
TARGET: thumbv7em-linux-eabi # TARGET: thumbv7em-linux-eabi
XARGO: 1 # XARGO: 1
thumbv7emhf: # thumbv7emhf:
TARGET: thumbv7em-linux-eabihf # TARGET: thumbv7em-linux-eabihf
XARGO: 1 # XARGO: 1
thumbv7m: # thumbv7m:
TARGET: thumbv7m-linux-eabi # TARGET: thumbv7m-linux-eabi
XARGO: 1 # XARGO: 1
wasm32: # wasm32:
TARGET: wasm32-unknown-unknown # TARGET: wasm32-unknown-unknown
ONLY_BUILD: 1 # ONLY_BUILD: 1
x86_64: # x86_64:
TARGET: x86_64-unknown-linux-gnu # TARGET: x86_64-unknown-linux-gnu
#
- job: macOS # - job: macOS
pool: # pool:
vmImage: macos-10.13 # vmImage: macos-10.13
steps: # steps:
- template: ci/azure-steps.yml # - template: ci/azure-steps.yml
strategy: # strategy:
matrix: # matrix:
x86_64: # x86_64:
TARGET: x86_64-apple-darwin # TARGET: x86_64-apple-darwin
# i686: # i686:
# TARGET: i686-apple-darwin # TARGET: i686-apple-darwin
#
- job: Windows - job: Windows
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
@ -72,9 +72,9 @@ jobs:
matrix: matrix:
i686-msvc: i686-msvc:
TARGET: i686-pc-windows-msvc TARGET: i686-pc-windows-msvc
# x86_64-msvc: x86_64-msvc:
# TARGET: x86_64-pc-windows-msvc TARGET: x86_64-pc-windows-msvc
# i686-gnu: i686-gnu:
# TARGET: i686-pc-windows-gnu TARGET: i686-pc-windows-gnu
x86_64-gnu: x86_64-gnu:
TARGET: x86_64-pc-windows-gnu TARGET: x86_64-pc-windows-gnu

View File

@ -13,7 +13,7 @@ steps:
- script: | - script: |
curl -sSf -o rustup-init.exe https://win.rustup.rs curl -sSf -o rustup-init.exe https://win.rustup.rs
rustup-init.exe -y --default-toolchain %TOOLCHAIN% rustup-init.exe -y --default-toolchain %TOOLCHAIN%-%TARGET%
echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
displayName: Install rust displayName: Install rust
condition: eq( variables['Agent.OS'], 'Windows_NT' ) condition: eq( variables['Agent.OS'], 'Windows_NT' )