Try #1345:

wasmerio · Mar 30, 2020 · 02e8a62 · 02e8a62
2 parents baa74d7 + eec7844
commit 02e8a62
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 104 deletions.
diff --git a/.azure/install-llvm.yml b/.azure/install-llvm.yml
@@ -26,8 +26,22 @@ steps:
         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')
+    displayName: "Install LLVM (Linux X64)"
+    condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OSArchitecture'], 'X64'))
+
+  - bash: |
+      set -ex
+      if [ -x "`command -v llvm-config`" ]; then
+        echo `command -v llvm-config` `llvm-config --version` installed
+      else
+        curl -O https://releases.llvm.org/8.0.0/clang+llvm-8.0.0-aarch64-linux-gnu.tar.xz
+        tar xf clang+llvm-8.0.0-aarch64-linux-gnu.tar.xz
+        export LLVM_PATH="`pwd`/clang+llvm-8.0.0-aarch64-linux-gnu/"
+        echo "##vso[task.prependpath]$LLVM_PATH/bin"
+        echo "##vso[task.setvariable variable=LLVM_SYS_80_PREFIX]$LLVM_PATH"
+      fi
+    displayName: "Install LLVM (Linux ARM)"
+    condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OSArchitecture'], 'ARM64'))
 
   - bash: |
       set -ex

diff --git a/.azure/install-sccache.yml b/.azure/install-sccache.yml
@@ -9,8 +9,12 @@ steps:
       curl -L https://github.com/mozilla/sccache/releases/download/0.2.10/sccache-0.2.10-x86_64-unknown-linux-musl.tar.gz | tar xzf -
       sccache=`pwd`/sccache-0.2.10-x86_64-unknown-linux-musl/sccache
       echo "##vso[task.setvariable variable=RUSTC_WRAPPER;]$sccache"
-    displayName: Install sccache - Linux
-    condition: eq( variables['Agent.OS'], 'Linux' )
+    displayName: Install sccache - Linux X64
+    condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OSArchitecture'], 'X64'))
+  # - bash: |
+  #     echo "##vso[task.setvariable variable=RUSTC_WRAPPER;]sccache"
+  #   displayName: Install sccache - Linux ARM
+  #   condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OSArchitecture'], 'ARM64'))
   - bash: |
       set -ex
       brew install [email protected]
@@ -32,7 +36,7 @@ steps:
       $RUSTC_WRAPPER -s
       cat sccache.log
     displayName: "start sccache"
-    condition: not(eq( variables['Agent.OS'], 'Windows_NT' ))
+    condition: not(or(eq( variables['Agent.OS'], 'Windows_NT' ), eq(variables['Agent.OSArchitecture'], 'ARM64')))
     env:
       SCCACHE_AZURE_CONNECTION_STRING: $(SCCACHE_AZURE_CONNECTION_STRING)
       SCCACHE_AZURE_BLOB_CONTAINER: $(SCCACHE_AZURE_BLOB_CONTAINER)

diff --git a/.travis.yml b/.travis.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,23 +44,30 @@ jobs:
     strategy:
       matrix:
         linux:
+          poolName: "Azure Pipelines"
           imageName: "ubuntu-16.04"
           rust_toolchain: nightly-2019-12-19
         android:
           imageName: "ubuntu-16.04"
           rust_toolchain: nightly-2019-12-19
           ANDROID: true
         mac:
+          poolName: "Azure Pipelines"
           imageName: "macos-10.14"
           rust_toolchain: nightly-2019-12-19
           # 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
           CARGO_HTTP_CHECK_REVOKE: false
+        arm:
+          poolName: "Packet"
+          rust_toolchain: nightly-2019-12-19
         windows:
+          poolName: "Azure Pipelines"
           imageName: "vs2017-win2016"
           rust_toolchain: '1.41.1'
     pool:
+      name: $(poolName)
       vmImage: $(imageName)
     condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
     steps:
@@ -85,7 +92,10 @@ jobs:
         condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
       - bash: make test
         displayName: Tests (*nix)
-        condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')), not(variables['ANDROID']))
+        condition: and(succeeded(), eq(variables['Agent.OSArchitecture'], 'X64'), not(eq(variables['Agent.OS'], 'Windows_NT')), not(variables['ANDROID']))
+      - bash: make spectests-singlepass
+        displayName: Tests (Linux ARM)
+        condition: and(succeeded(), eq(variables['Agent.OSArchitecture'], 'ARM64'), not(variables['ANDROID']))
       - bash: make test-android
         displayName: Tests (Android)
         condition: and(succeeded(), variables['ANDROID'])
@@ -113,13 +123,19 @@ jobs:
     strategy:
       matrix:
         linux:
+          poolName: "Azure Pipelines"
           imageName: "ubuntu-16.04"
           rust_toolchain: nightly-2019-12-19
         mac:
+          poolName: "Azure Pipelines"
           imageName: "macos-10.14"
           rust_toolchain: nightly-2019-12-19
           MACOSX_DEPLOYMENT_TARGET: 10.10
+        arm:
+          poolName: "Packet"
+          rust_toolchain: nightly-2019-12-19
         windows:
+          poolName: "Azure Pipelines"
           imageName: "vs2017-win2016"
           rust_toolchain: '1.41.1'
           # RUSTFLAGS: -Ctarget-feature=+crt-static
@@ -141,11 +157,14 @@ jobs:
           mkdir -p artifacts
         displayName: Create Artifacts Dir
       - bash: make release
-        displayName: Build (*nix)
-        condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
+        displayName: Build (*nix X64)
+        condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')), eq(variables['Agent.OSArchitecture'], 'X64'))
       - bash: sudo apt-get install musl-tools && make release-musl
         displayName: Build (Linux, x86_64-unknown-linux-musl)
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'), eq(variables['Agent.OSArchitecture'], 'X64'))
+      - bash: make release-singlepass
+        displayName: Build (ARM)
+        condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')), eq(variables['Agent.OSArchitecture'], 'ARM64'))
       - bash: make release-llvm
         displayName: Build (Windows)
         condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
@@ -211,7 +230,7 @@ jobs:
       - bash: |
           make test-capi
         displayName: Test c-api
-        condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
+        condition: and(succeeded(), eq(variables['Agent.OSArchitecture'], 'X64'), not(eq(variables['Agent.OS'], 'Windows_NT')))
       - bash: |
           make capi
         displayName: Build c-api
@@ -277,9 +296,8 @@ jobs:
       - script: VERSION_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
         displayName: Set the tag name as an environment variable
       - task: GithubRelease@0
-        displayName: "Create GitHub Release"
+        displayName: "Create GitHub Release with artifacts"
         condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
-        continueOnError: true
         inputs:
           gitHubConnection: 'wasmer'
           repositoryName: 'wasmerio/wasmer'
@@ -291,21 +309,6 @@ jobs:
           # TODO: automate it all by getting the release notes from somewhere else and using the `releaseNotesFile` key
           isDraft: false
           isPreRelease: false
-      - task: GithubRelease@0
-        displayName: "Update GitHub Release with assets"
-        condition: and(succeededOrFailed(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
-        inputs:
-          gitHubConnection: 'wasmer'
-          repositoryName: 'wasmerio/wasmer'
-          action: 'edit'
-          target: '$(Build.SourceVersion)'
-          title: '$(VERSION_TAG)'
-          tag: $(VERSION_TAG)
-          addChangeLog: false
-          tagSource: 'auto'
-          # TODO: automate it all by getting the release notes from somewhere else and using the `releaseNotesFile` key
-          isDraft: false
-          isPreRelease: false
           assets: '$(Build.ArtifactStagingDirectory)/**'
           assetUploadMode: 'replace' # Don't delete previously uploaded assets (default)
 

diff --git a/bors.toml b/bors.toml
@@ -1,6 +1,5 @@
 status = [
-    "wasmerio.wasmer",
-    "continuous-integration/travis-ci/push"
+    "wasmerio.wasmer"
 ]
 required_approvals = 1
 timeout_sec = 7200