Uncomment other jobs

alexcrichton · alexcrichton · commit 13a59c3c8860 · 2019-04-10T10:41:05.000-07:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,54 +2,54 @@ trigger:
   - master
 
 jobs:
-  # - job: Linux
-  #   pool:
-  #     vmImage: ubuntu-16.04
-  #   steps:
-  #     - template: ci/azure-steps.yml
-  #   strategy:
-  #     matrix:
-  #       arm-android:
-  #         TARGET: arm-linux-androideabi
-  #       aarch64-android:
-  #         TARGET: aarch64-linux-android
-  #       i686-android:
-  #         TARGET: i686-linux-android
-  #       x86_64-android:
-  #         TARGET: x86_64-linux-android
-  #       x86_64:
-  #         TARGET: x86_64-unknown-linux-gnu
-  #       i686:
-  #         TARGET: i686-unknown-linux-gnu
-  #       arm:
-  #         TARGET: arm-unknown-linux-gnueabi
-  #       aarch64:
-  #         TARGET: aarch64-unknown-linux-gnu
-  #       x86_64-musl:
-  #         TARGET: x86_64-unknown-linux-musl
-  #       x86_64-mingw:
-  #         TARGET: x86_64-pc-windows-gnu
-  #       asmjs:
-  #         TARGET: asmjs-unknown-emscripten
-  #
-  #       x86_64-beta:
-  #         TARGET: x86_64-unknown-linux-gnu
-  #         TOOLCHAIN: beta
-  #       x86_64-nightly:
-  #         TARGET: x86_64-unknown-linux-gnu
-  #         TOOLCHAIN: nightly
-  #
-  # - job: macOS
-  #   pool:
-  #     vmImage: macos-10.13
-  #   steps:
-  #     - template: ci/azure-steps.yml
-  #   strategy:
-  #     matrix:
-  #       x86_64:
-  #         TARGET: x86_64-apple-darwin
-  #       i686:
-  #         TARGET: i686-apple-darwin
+  - job: Linux
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+      - template: ci/azure-steps.yml
+    strategy:
+      matrix:
+        arm-android:
+          TARGET: arm-linux-androideabi
+        aarch64-android:
+          TARGET: aarch64-linux-android
+        i686-android:
+          TARGET: i686-linux-android
+        x86_64-android:
+          TARGET: x86_64-linux-android
+        x86_64:
+          TARGET: x86_64-unknown-linux-gnu
+        i686:
+          TARGET: i686-unknown-linux-gnu
+        arm:
+          TARGET: arm-unknown-linux-gnueabi
+        aarch64:
+          TARGET: aarch64-unknown-linux-gnu
+        x86_64-musl:
+          TARGET: x86_64-unknown-linux-musl
+        x86_64-mingw:
+          TARGET: x86_64-pc-windows-gnu
+        asmjs:
+          TARGET: asmjs-unknown-emscripten
+
+        x86_64-beta:
+          TARGET: x86_64-unknown-linux-gnu
+          TOOLCHAIN: beta
+        x86_64-nightly:
+          TARGET: x86_64-unknown-linux-gnu
+          TOOLCHAIN: nightly
+
+  - job: macOS
+    pool:
+      vmImage: macos-10.13
+    steps:
+      - template: ci/azure-steps.yml
+    strategy:
+      matrix:
+        x86_64:
+          TARGET: x86_64-apple-darwin
+        i686:
+          TARGET: i686-apple-darwin
 
   - job: Windows
     pool:
@@ -61,12 +61,16 @@ jobs:
         i686-msvc:
           TARGET: i686-pc-windows-msvc
           RUSTFLAGS: -Ctarget-feature=-crt-static
+          NAME: i686-msvc
         i686-msvc-static:
           TARGET: i686-pc-windows-msvc
           RUSTFLAGS: -Ctarget-feature=+crt-static
+          NAME: i686-msvc-static
         x86_64-msvc:
           TARGET: x86_64-pc-windows-msvc
           RUSTFLAGS: -Ctarget-feature=-crt-static
+          NAME: x86_64-msvc
         x86_64-msvc-static:
           TARGET: x86_64-pc-windows-msvc
           RUSTFLAGS: -Ctarget-feature=+crt-static
+          NAME: x86_64-msvc-static
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml
@@ -1,6 +1,5 @@
 steps:
   - script: |
-      echo ##vso[task.prependpath]C:\Strawberry\perl\bin
     displayName: Use strawberry perl
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
@@ -16,16 +15,19 @@ steps:
     condition: and( ne( variables['Agent.OS'], 'Windows_NT' ), succeeded() )
     displayName: Run test script (unix)
 
-  - script: |
-      cargo test --manifest-path testcrate/Cargo.toml --target %TARGET%
-      cargo test --manifest-path testcrate/Cargo.toml --target %TARGET% --release
+  - bash: |
+      set -e
+      export PATH="/c/Strawberry/perl/bin:$PATH"
+      cargo test --manifest-path testcrate/Cargo.toml --target $TARGET
+      cargo test --manifest-path testcrate/Cargo.toml --target $TARGET --release
       cargo run --release --target $TARGET --manifest-path testcrate/Cargo.toml --features package
+      mv *.tar.gz release.tar.gz
     condition: and( eq( variables['Agent.OS'], 'Windows_NT' ), succeeded() )
     displayName: Run test script (windows)
 
   - task: PublishPipelineArtifact@0
     condition: and( eq( variables['Agent.OS'], 'Windows_NT' ), succeeded() )
     displayName: Push Windows package
     inputs:
-      artifactName: test
-      targetPath: '*.tar.gz'
+      artifactName: '$(NAME)'
+      targetPath: 'release.tar.gz'
