Moved build wapm into Makefile

.travis.yml

@@ -28,7 +28,9 @@ script:
 before_deploy:
   # Release
   - make release-singlepass
-  - make wapm
+  # Build WAPM
+  - make build-wapm
+  # Make package
   - make build-install-package
   - mkdir -p artifacts
   - cp ./wasmer.tar.gz ./artifacts/$(./scripts/binary-name.sh)

Makefile

@@ -315,6 +315,11 @@ endif
 	cp lib/runtime-c-api/doc/index.md ./capi/README.md
 	tar -C ./capi -zcvf wasmer-c-api.tar.gz lib include README.md LICENSE
 
+WAPM_VERSION = 0.4.3
+build-wapm:
+	git clone --branch $(WAPM_VERSION) https://github.com/wasmerio/wapm-cli.git
+	cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
+
 # For installing the contents locally
 do-install:
 	tar -C ~/.wasmer -zxvf wasmer.tar.gz

azure-pipelines.yml

@@ -143,13 +143,10 @@ jobs:
         displayName: Build (Windows)
         condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
       - bash: |
-          git clone --branch $WAPM_VERSION https://github.com/wasmerio/wapm-cli.git
+          make build-wapm
-          cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
         displayName: Build WAPM
         condition: |
           startsWith(variables['Build.SourceBranch'], 'refs/tags')
-        env:
-          WAPM_VERSION: 0.4.3
       - bash: |
           make build-install-package
           cp ./wasmer.tar.gz ./artifacts/$(./scripts/binary-name.sh)