diff --git a/library/stdarch/azure-pipelines.yml b/library/stdarch/azure-pipelines.yml index 6e3a6ca17c5e..3e5ebdb603f3 100644 --- a/library/stdarch/azure-pipelines.yml +++ b/library/stdarch/azure-pipelines.yml @@ -11,6 +11,7 @@ pr: ["master"] jobs: - job: DockerLinux + dependsOn: StyleAndDocs pool: vmImage: ubuntu-16.04 steps: @@ -160,6 +161,7 @@ jobs: CI: 1 - job: AutomaticVerification + dependsOn: StyleAndDocs pool: vmImage: ubuntu-16.04 steps: @@ -168,6 +170,7 @@ jobs: displayName: Automatic verification - job: GameBoyAdvance + dependsOn: StyleAndDocs pool: vmImage: ubuntu-16.04 steps: diff --git a/library/stdarch/ci/azure-install-rust.yml b/library/stdarch/ci/azure-install-rust.yml index 26e34be26561..feb06588f3ab 100644 --- a/library/stdarch/ci/azure-install-rust.yml +++ b/library/stdarch/ci/azure-install-rust.yml @@ -33,6 +33,28 @@ steps: if defined TARGET rustup target add %TARGET% condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Install target (windows) + - script: | + @echo on + if "%ARCH%" == "i686" choco install mingw --x86 --force + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Install MinGW32 (windows) + - bash: | + set -ex + gcc -print-search-dirs + find "C:\ProgramData\Chocolatey" -name "crt2*" + find "C:\ProgramData\Chocolatey" -name "dllcrt2*" + find "C:\ProgramData\Chocolatey" -name "libmsvcrt*" + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Find GCC libraries (windows) + - bash: | + set -ex + if [[ -n ${ARCH_BITS} ]]; then + for i in crt2.o dllcrt2.o libmsvcrt.a ; do + cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw${ARCH_BITS}/${ARCH}-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/${TARGET}/lib" + done + fi + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Fix MinGW (windows) - bash: | set -ex rustc -Vv @@ -43,8 +65,12 @@ steps: which cargo which rustup displayName: Query rust and cargo versions + - script: | + @echo on + where gcc + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Query gcc path - bash: | set -ex cargo generate-lockfile displayName: Generate lockfiles -